Skip to content

[Code]: fix icon for module and namespace #35428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 23, 2019
Merged

[Code]: fix icon for module and namespace #35428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion x-pack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
"@babel/runtime": "^7.3.4",
"@elastic/datemath": "5.0.2",
"@elastic/eui": "10.1.0",
"@elastic/javascript-typescript-langserver": "^0.1.21",
"@elastic/javascript-typescript-langserver": "^0.1.23",
"@elastic/lsp-extension": "^0.1.1",
"@elastic/node-crypto": "0.1.2",
"@elastic/nodegit": "0.25.0-alpha.12",
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/code/public/components/query_bar/suggestions/symbol_suggestions_provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ export class SymbolSuggestionsProvider extends AbstractSuggestionsProvider {
case 1: // File
return 'tokenFile';
case 2: // Module
return 'tokenElement';
return 'tokenModule';
case 3: // Namespace
return 'tokenElement';
return 'tokenNamespace';
case 4: // Package
return 'tokenPackage';
case 5: // Class
Expand Down
7 changes: 5 additions & 2 deletions ...ugins/code/public/components/symbol_tree/__test__/__snapshots__/symbol_tree.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions x-pack/plugins/code/public/components/symbol_tree/code_symbol_tree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,9 @@ export class CodeSymbolTree extends React.PureComponent<Props, { activePath?: st
path: string = ''
) => () => {
let tokenType = 'tokenFile';
if (kind !== SymbolKind.Module) {
// @ts-ignore
tokenType = `token${Object.keys(SymbolKind).find(k => SymbolKind[k] === kind)}`;
}

// @ts-ignore
tokenType = `token${Object.keys(SymbolKind).find(k => SymbolKind[k] === kind)}`;
let bg = null;
if (this.state.activePath === path) {
bg = <div className="code-full-width-node" />;
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1393,10 +1393,10 @@
oppsy "2.x.x"
pumpify "1.3.x"

"@elastic/javascript-typescript-langserver@^0.1.21":
version "0.1.21"
resolved "https://registry.yarnpkg.com/@elastic/javascript-typescript-langserver/-/javascript-typescript-langserver-0.1.21.tgz#6b2e0e4b21c251e1383c31b5d490604f7fef8916"
integrity sha512-Bbbkt2lZjhFBgwV4Y4apI+t95lJFU3DAaGwffN+8/V0psbLZmwp+X/t6bomaIl3baR24bpXQCzmz356QhoT/uw==
"@elastic/javascript-typescript-langserver@^0.1.23":
version "0.1.23"
resolved "https://registry.yarnpkg.com/@elastic/javascript-typescript-langserver/-/javascript-typescript-langserver-0.1.23.tgz#84401643e33d54570fd44a0541d6c176805fb722"
integrity sha512-L9P9LsKWt67hdgHJh+oTxQn6/F4fn7hpHu+jXuRaaysmddZ9IrSeg3y/1q1TPIsftgWgjQL31agD0Sm6/F/kOg==
dependencies:
"@elastic/lsp-extension" "^0.1.1"
javascript-typescript-langserver "^2.11.3"
Expand Down