Skip to content
This repository was archived by the owner on Jan 20, 2023. It is now read-only.

Commit 46a56da

Browse files
author
Valeriy Svydenko
authored
Merge pull request #13 from svor/cleanup
Make code cleanup
2 parents 4179778 + 4c4c035 commit 46a56da

File tree

6 files changed

+78
-80
lines changed

6 files changed

+78
-80
lines changed

‎che-theia-java-extension/src/browser/che-ls-jdt-commands.ts‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -10,113 +10,113 @@
1010
* Red Hat, Inc. - initial API and implementation
1111
*/
1212

13-
export const HELLO_WORLD_COMMAND = "org.eclipse.che.jdt.ls.extension.samplecommand";
13+
export const HELLO_WORLD_COMMAND = 'org.eclipse.che.jdt.ls.extension.samplecommand';
1414
export const FILE_STRUCTURE_COMMAND =
15-
"org.eclipse.che.jdt.ls.extension.filestructure";
16-
export const TEST_DETECT_COMMAND = "che.jdt.ls.extension.detectTest";
17-
export const FIND_TEST_BY_CURSOR_COMMAND = "che.jdt.ls.extension.findTestByCursor";
15+
'org.eclipse.che.jdt.ls.extension.filestructure';
16+
export const TEST_DETECT_COMMAND = 'che.jdt.ls.extension.detectTest';
17+
export const FIND_TEST_BY_CURSOR_COMMAND = 'che.jdt.ls.extension.findTestByCursor';
1818
export const FIND_TESTS_FROM_PROJECT_COMMAND =
19-
"che.jdt.ls.extension.findTestFromProject";
19+
'che.jdt.ls.extension.findTestFromProject';
2020
export const FIND_TESTS_FROM_FOLDER_COMMAND =
21-
"che.jdt.ls.extension.findTestFromFolder";
21+
'che.jdt.ls.extension.findTestFromFolder';
2222
export const FIND_TESTS_FROM_ENTRY_COMMAND =
23-
"che.jdt.ls.extension.findTestFromEntry";
24-
export const FIND_TESTS_IN_FILE_COMMAND = "che.jdt.ls.extension.findTestInFile";
25-
export const RESOLVE_CLASSPATH_COMMAND = "che.jdt.ls.extension.resolveClasspath";
26-
export const GET_OUTPUT_DIR_COMMAND = "che.jdt.ls.extension.outputDir";
27-
export const GET_EFFECTIVE_POM_COMMAND = "che.jdt.ls.extension.effectivePom";
28-
export const GET_MAVEN_PROJECTS_COMMAND = "che.jdt.ls.extension.mavenProjects";
29-
export const RECOMPUTE_POM_DIAGNOSTICS = "che.jdt.ls.extension.pom.diagnostics";
23+
'che.jdt.ls.extension.findTestFromEntry';
24+
export const FIND_TESTS_IN_FILE_COMMAND = 'che.jdt.ls.extension.findTestInFile';
25+
export const RESOLVE_CLASSPATH_COMMAND = 'che.jdt.ls.extension.resolveClasspath';
26+
export const GET_OUTPUT_DIR_COMMAND = 'che.jdt.ls.extension.outputDir';
27+
export const GET_EFFECTIVE_POM_COMMAND = 'che.jdt.ls.extension.effectivePom';
28+
export const GET_MAVEN_PROJECTS_COMMAND = 'che.jdt.ls.extension.mavenProjects';
29+
export const RECOMPUTE_POM_DIAGNOSTICS = 'che.jdt.ls.extension.pom.diagnostics';
3030
export const REIMPORT_MAVEN_PROJECTS_COMMAND =
31-
"che.jdt.ls.extension.reImportMavenProject";
32-
export const GET_CLASS_PATH_TREE_COMMAND = "che.jdt.ls.extension.classpathTree";
31+
'che.jdt.ls.extension.reImportMavenProject';
32+
export const GET_CLASS_PATH_TREE_COMMAND = 'che.jdt.ls.extension.classpathTree';
3333

3434
/**
3535
* External Libraries
3636
*/
3737

3838
export const GET_EXTERNAL_LIBRARIES_COMMAND =
39-
"che.jdt.ls.extension.externalLibraries";
39+
'che.jdt.ls.extension.externalLibraries';
4040
export const GET_EXTERNAL_LIBRARIES_CHILDREN_COMMAND =
41-
"che.jdt.ls.extension.externalLibrariesChildren";
42-
export const GET_LIBRARY_CHILDREN_COMMAND = "che.jdt.ls.extension.libraryChildren";
43-
export const GET_LIBRARY_ENTRY_COMMAND = "che.jdt.ls.extension.libraryEntry";
41+
'che.jdt.ls.extension.externalLibrariesChildren';
42+
export const GET_LIBRARY_CHILDREN_COMMAND = 'che.jdt.ls.extension.libraryChildren';
43+
export const GET_LIBRARY_ENTRY_COMMAND = 'che.jdt.ls.extension.libraryEntry';
4444

4545
/**
4646
* Debug
4747
*/
4848

4949
export const FIND_RESOURCES_BY_FQN =
50-
"che.jdt.ls.extension.debug.findResourcesByFqn";
50+
'che.jdt.ls.extension.debug.findResourcesByFqn';
5151
export const IDENTIFY_FQN_IN_RESOURCE =
52-
"che.jdt.ls.extension.debug.identifyFqnInResource";
53-
export const USAGES_COMMAND = "che.jdt.ls.extension.usages";
52+
'che.jdt.ls.extension.debug.identifyFqnInResource';
53+
export const USAGES_COMMAND = 'che.jdt.ls.extension.usages';
5454

55-
export const UPDATE_WORKSPACE = "che.jdt.ls.extension.updateWorkspace";
55+
export const UPDATE_WORKSPACE = 'che.jdt.ls.extension.updateWorkspace';
5656

5757
/**
5858
* Simple java project
5959
*/
6060

61-
export const CREATE_SIMPLE_PROJECT = "che.jdt.ls.extension.plain.createProject";
61+
export const CREATE_SIMPLE_PROJECT = 'che.jdt.ls.extension.plain.createProject';
6262
export const UPDATE_PROJECT_CLASSPATH =
63-
"che.jdt.ls.extension.plain.updateClasspath";
64-
export const GET_SOURCE_FOLDERS = "che.jdt.ls.extension.plain.sourceFolders";
63+
'che.jdt.ls.extension.plain.updateClasspath';
64+
export const GET_SOURCE_FOLDERS = 'che.jdt.ls.extension.plain.sourceFolders';
6565

6666
/**
6767
* Navigation
6868
*/
6969

70-
export const FIND_IMPLEMENTERS_COMMAND = "che.jdt.ls.extension.findImplementers";
70+
export const FIND_IMPLEMENTERS_COMMAND = 'che.jdt.ls.extension.findImplementers';
7171

7272
/**
7373
* Configuration
7474
*/
7575

7676
export const GET_JAVA_CORE_OPTIONS_СOMMAND =
77-
"che.jdt.ls.extension.configuration.getJavaCoreOptions";
77+
'che.jdt.ls.extension.configuration.getJavaCoreOptions';
7878
export const UPDATE_JAVA_CORE_OPTIONS_СOMMAND =
79-
"che.jdt.ls.extension.configuration.updateJavaCoreOptions";
79+
'che.jdt.ls.extension.configuration.updateJavaCoreOptions';
8080
export const GET_PREFERENCES_СOMMAND =
81-
"che.jdt.ls.extension.configuration.getPreferences";
81+
'che.jdt.ls.extension.configuration.getPreferences';
8282
export const UPDATE_PREFERENCES_СOMMAND =
83-
"che.jdt.ls.extension.configuration.updatePreferences";
83+
'che.jdt.ls.extension.configuration.updatePreferences';
8484

8585
/**
8686
* Imports
8787
*/
8888

89-
export const ORGANIZE_IMPORTS = "che.jdt.ls.extension.import.organizeImports";
89+
export const ORGANIZE_IMPORTS = 'che.jdt.ls.extension.import.organizeImports';
9090

9191
/**
9292
* Refactoring
9393
*/
9494

95-
export const RENAME_COMMAND = "che.jdt.ls.extension.refactoring.rename";
95+
export const RENAME_COMMAND = 'che.jdt.ls.extension.refactoring.rename';
9696
export const GET_RENAME_TYPE_COMMAND =
97-
"che.jdt.ls.extension.refactoring.rename.get.type";
97+
'che.jdt.ls.extension.refactoring.rename.get.type';
9898
export const VALIDATE_RENAMED_NAME_COMMAND =
99-
"che.jdt.ls.extension.refactoring.rename.validate.new.name";
99+
'che.jdt.ls.extension.refactoring.rename.validate.new.name';
100100
export const GET_LINKED_ELEMENTS_COMMAND =
101-
"che.jdt.ls.extension.refactoring.rename.get.linked.elements";
101+
'che.jdt.ls.extension.refactoring.rename.get.linked.elements';
102102
export const VALIDATE_MOVE_COMMAND =
103-
"che.jdt.ls.extension.refactoring.move.validate";
103+
'che.jdt.ls.extension.refactoring.move.validate';
104104
export const GET_DESTINATIONS_COMMAND =
105-
"che.jdt.ls.extension.refactoring.move.get.destinations.command";
106-
export const MOVE_COMMAND = "che.jdt.ls.extension.refactoring.move.command";
105+
'che.jdt.ls.extension.refactoring.move.get.destinations.command';
106+
export const MOVE_COMMAND = 'che.jdt.ls.extension.refactoring.move.command';
107107
export const VERIFY_MOVE_DESTINATION_COMMAND =
108-
"che.jdt.ls.extension.refactoring.move.verify.destination";
108+
'che.jdt.ls.extension.refactoring.move.verify.destination';
109109

110110
/**
111111
* Classpath updater
112112
*/
113113

114114
export const CLIENT_UPDATE_PROJECTS_CLASSPATH =
115-
"che.jdt.ls.extension.workspace.clientUpdateProjectsClasspath";
115+
'che.jdt.ls.extension.workspace.clientUpdateProjectsClasspath';
116116

117117
/**
118118
* Project updater
119119
*/
120120

121121
export const CLIENT_UPDATE_PROJECT =
122-
"che.jdt.ls.extension.workspace.clientUpdateProject";
122+
'che.jdt.ls.extension.workspace.clientUpdateProject';

‎che-theia-java-extension/src/browser/che-theia-java-contribution.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
* Red Hat, Inc. - initial API and implementation
1111
*/
1212

13-
import { injectable } from "inversify";
14-
import { CommandContribution, CommandRegistry, MenuContribution, MenuModelRegistry } from "@theia/core/lib/common";
15-
import { KeybindingContribution, KeybindingRegistry } from "@theia/core/lib/browser";
13+
import { injectable } from 'inversify';
14+
import { CommandContribution, CommandRegistry, MenuContribution, MenuModelRegistry } from '@theia/core/lib/common';
15+
import { KeybindingContribution, KeybindingRegistry } from '@theia/core/lib/browser';
1616

1717
@injectable()
1818
export class JavaExtensionContribution implements CommandContribution, MenuContribution, KeybindingContribution {

‎che-theia-java-extension/src/browser/che-theia-java-frontend-module.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import {
1616
MenuContribution
1717
} from "@theia/core/lib/common";
1818

19-
import { ContainerModule } from "inversify";
19+
import { ContainerModule } from 'inversify';
2020
import { KeybindingContribution, KeybindingContext } from '@theia/core/lib/browser';
2121

22-
import "../../src/browser/styles/icons.css";
22+
import '../../src/browser/styles/icons.css';
2323
import { FileStructure } from './navigation/file-structure';
2424
import { FindImplementers } from './navigation/find-implementers';
2525
import { JavaEditorTextFocusContext } from './java-keybinding-contexts';

‎che-theia-java-extension/src/browser/java-keybinding-contexts.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
1515
********************************************************************************/
1616

17-
import { injectable } from "inversify";
18-
import { EditorTextFocusContext, EditorWidget } from "@theia/editor/lib/browser";
19-
import { JAVA_LANGUAGE_ID } from "@theia/java/lib/browser";
17+
import { injectable } from 'inversify';
18+
import { EditorTextFocusContext, EditorWidget } from '@theia/editor/lib/browser';
19+
import { JAVA_LANGUAGE_ID } from '@theia/java/lib/browser';
2020

2121
export namespace JavaKeybindingContexts {
2222
export const javaEditorTextFocus = 'javaEditorTextFocus';

‎che-theia-java-extension/src/browser/navigation/file-structure.ts‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
* Red Hat, Inc. - initial API and implementation
1111
*/
1212

13-
import { inject, injectable } from "inversify";
14-
import { QuickOpenModel, QuickOpenItem, KeybindingRegistry, Keybinding, QuickOpenService, QuickOpenMode, KeybindingContribution } from "@theia/core/lib/browser";
15-
import { CommandRegistry, CommandContribution, Command, MenuModelRegistry, MenuContribution } from "@theia/core";
16-
import { ILanguageClient, ExecuteCommandRequest, SymbolKind } from "@theia/languages/lib/browser";
17-
import { LanguageClientProvider } from "@theia/languages/lib/browser/language-client-provider";
18-
import { EditorManager, EDITOR_CONTEXT_MENU } from "@theia/editor/lib/browser";
19-
import { FILE_STRUCTURE_COMMAND } from "../che-ls-jdt-commands";
13+
import { inject, injectable } from 'inversify';
14+
import { QuickOpenModel, QuickOpenItem, KeybindingRegistry, Keybinding, QuickOpenService, QuickOpenMode, KeybindingContribution } from '@theia/core/lib/browser';
15+
import { CommandRegistry, CommandContribution, Command, MenuModelRegistry, MenuContribution } from '@theia/core';
16+
import { ILanguageClient, ExecuteCommandRequest, SymbolKind } from '@theia/languages/lib/browser';
17+
import { LanguageClientProvider } from '@theia/languages/lib/browser/language-client-provider';
18+
import { EditorManager, EDITOR_CONTEXT_MENU } from '@theia/editor/lib/browser';
19+
import { FILE_STRUCTURE_COMMAND } from '../che-ls-jdt-commands';
2020
import URI from '@theia/core/lib/common/uri';
2121
import { Range } from 'vscode-languageserver-types';
2222

@@ -66,7 +66,7 @@ export class FileStructure implements QuickOpenModel, CommandContribution, Keybi
6666
/**
6767
* The current lookFor string input by the user.
6868
*/
69-
protected currentLookFor: string = "";
69+
protected currentLookFor: string = '';
7070

7171
private items!: QuickOpenItem[];
7272
private command: Command = {
@@ -77,12 +77,10 @@ export class FileStructure implements QuickOpenModel, CommandContribution, Keybi
7777
constructor(
7878
@inject(CommandRegistry) protected readonly commands: CommandRegistry,
7979
@inject(KeybindingRegistry) protected readonly keybindingRegistry: KeybindingRegistry,
80-
@inject(KeybindingRegistry) protected readonly keybindings: KeybindingRegistry,
8180
@inject(QuickOpenService) protected readonly quickOpenService: QuickOpenService,
8281
@inject(LanguageClientProvider) protected readonly languageClientProvider: LanguageClientProvider,
8382
@inject(EditorManager) protected readonly editorManager: EditorManager
84-
) {
85-
}
83+
) {}
8684

8785
async open() {
8886
// Triggering the keyboard shortcut while the dialog is open toggles
@@ -94,14 +92,14 @@ export class FileStructure implements QuickOpenModel, CommandContribution, Keybi
9492
this.isOpen = true;
9593
}
9694

97-
let placeholderText = "File Structure.";
95+
let placeholderText = 'File Structure.';
9896
const keybinding = this.getKeyCommand();
9997
const showOrHide = this.showInheritedMembers ? 'hide' : 'show';
10098
if (keybinding) {
10199
placeholderText += ` (Press ${keybinding} to ${showOrHide} inherited members)`;
102100
}
103101

104-
const client = await this.languageClientProvider.getLanguageClient("java");
102+
const client = await this.languageClientProvider.getLanguageClient('java');
105103
if (client) {
106104
const fileStructureResponse = await this.doRequestToStructure(client);
107105

@@ -115,7 +113,7 @@ export class FileStructure implements QuickOpenModel, CommandContribution, Keybi
115113
placeholder: placeholderText,
116114
onClose: () => {
117115
this.isOpen = false;
118-
this.currentLookFor = "";
116+
this.currentLookFor = '';
119117
},
120118
});
121119
}
@@ -161,7 +159,7 @@ export class FileStructure implements QuickOpenModel, CommandContribution, Keybi
161159
registerKeybindings(keybindings: KeybindingRegistry): void {
162160
keybindings.registerKeybinding({
163161
command: this.command.id,
164-
keybinding: "ctrlcmd+alt+o"
162+
keybinding: 'ctrlcmd+alt+m'
165163
});
166164
}
167165

@@ -175,7 +173,7 @@ export class FileStructure implements QuickOpenModel, CommandContribution, Keybi
175173
registerMenus(menus: MenuModelRegistry): void {
176174
menus.registerMenuAction([...EDITOR_CONTEXT_MENU, 'navigation'], {
177175
commandId: this.command.id,
178-
label: "Navigate File Structure"
176+
label: 'Navigate File Structure'
179177
});
180178
}
181179

@@ -229,25 +227,25 @@ export class MemberQuickOpenItem extends QuickOpenItem {
229227
}
230228

231229
getDescription(): string {
232-
return "";
230+
return '';
233231
}
234232

235233
getIconClass() {
236234
switch (this.kind) {
237235
case SymbolKind.Interface: {
238-
return "java-interface-icon file-icon";
236+
return 'java-interface-icon file-icon';
239237
}
240238
case SymbolKind.Enum: {
241-
return "java-enum-icon file-icon";
239+
return 'java-enum-icon file-icon';
242240
}
243241
case SymbolKind.Field: {
244-
return "java-field-icon file-icon";
242+
return 'java-field-icon file-icon';
245243
}
246244
case SymbolKind.Method: {
247-
return "java-method-icon file-icon";
245+
return 'java-method-icon file-icon';
248246
}
249247
default:
250-
return "java-class-icon file-icon";
248+
return 'java-class-icon file-icon';
251249
}
252250
}
253251

‎che-theia-java-extension/src/browser/navigation/find-implementers.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export class FindImplementers implements QuickOpenModel, CommandContribution, Ke
5656
}
5757

5858
async execute() {
59-
const client = await this.languageClientProvider.getLanguageClient("java");
59+
const client = await this.languageClientProvider.getLanguageClient('java');
6060
if (client) {
6161
const implementersResponse = await this.doRequestToimplementers(client);
6262

@@ -91,7 +91,7 @@ export class FindImplementers implements QuickOpenModel, CommandContribution, Ke
9191
registerKeybindings(keybindings: KeybindingRegistry): void {
9292
keybindings.registerKeybinding({
9393
command: this.command.id,
94-
keybinding: "ctrlcmd+alt+b",
94+
keybinding: 'ctrlcmd+alt+b',
9595
context: JavaKeybindingContexts.javaEditorTextFocus
9696
});
9797
}
@@ -103,7 +103,7 @@ export class FindImplementers implements QuickOpenModel, CommandContribution, Ke
103103
registerMenus(menus: MenuModelRegistry): void {
104104
menus.registerMenuAction([...EDITOR_CONTEXT_MENU, 'navigation'], {
105105
commandId: this.command.id,
106-
label: "Open Implementation(s)"
106+
label: 'Open Implementation(s)'
107107
});
108108
}
109109

@@ -135,8 +135,8 @@ export class FindImplementers implements QuickOpenModel, CommandContribution, Ke
135135
}
136136

137137
return {
138-
"searchedElement": "",
139-
"implementers": []
138+
'searchedElement': '',
139+
'implementers': []
140140
};
141141
}
142142

@@ -175,13 +175,13 @@ export class ImplementerQuickOpenItem extends QuickOpenItem {
175175
getIconClass() {
176176
switch (this.kind) {
177177
case SymbolKind.Interface: {
178-
return "java-interface-icon file-icon";
178+
return 'java-interface-icon file-icon';
179179
}
180180
case SymbolKind.Enum: {
181-
return "java-enum-icon file-icon";
181+
return 'java-enum-icon file-icon';
182182
}
183183
default:
184-
return "java-class-icon file-icon";
184+
return 'java-class-icon file-icon';
185185
}
186186
}
187187

0 commit comments

Comments
 (0)