Skip to content

Commit 8330ee5

Browse files
angelozerrangelozerr
committed
Rename to ScriptElementKind (like TypeScript).
1 parent 1d3a0c1 commit 8330ee5

File tree

7 files changed

+86
-28
lines changed

7 files changed

+86
-28
lines changed

core/ts.core/src/ts/TypeScriptKind.java renamed to core/ts.core/src/ts/ScriptElementKind.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,19 @@
1212

1313
/**
1414
* TypeScript model kind.
15+
*
16+
* @see https://github.com/Microsoft/TypeScript/blob/master/src/services/types.ts
1517
*
1618
*/
17-
public enum TypeScriptKind {
19+
public enum ScriptElementKind {
1820

19-
ALIAS, PRIMITIVE_TYPE, KEYWORD, CLASS, INTERFACE, MODULE, SCRIPT, DIRECTORY, PROPERTY, METHOD, CONSTRUCTOR, FUNCTION, VAR, LET, ENUM, PRIVATE, PUBLIC, STATIC, TYPE, ELEMENT, ATTRIBUTE, COMPONENT, CONST, GETTER, SETTER, WARNING;
21+
ALIAS, PRIMITIVE_TYPE, KEYWORD, CLASS, INTERFACE, MODULE, SCRIPT, DIRECTORY, PROPERTY, METHOD, CONSTRUCTOR, FUNCTION, VAR, LET, ENUM, TYPE, ELEMENT, ATTRIBUTE, COMPONENT, CONST, GETTER, SETTER, WARNING;
2022

21-
public static TypeScriptKind getKind(String kind) {
23+
public static ScriptElementKind getKind(String kind) {
2224
try {
23-
return TypeScriptKind.valueOf(kind.toUpperCase());
25+
return ScriptElementKind.valueOf(kind.toUpperCase());
2426
} catch (Exception e) {
25-
return TypeScriptKind.WARNING;
27+
return ScriptElementKind.WARNING;
2628
}
2729
}
2830
}

‎core/ts.core/src/ts/ScriptElementKindModifier.java‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
/**
2+
* Copyright (c) 2015-2016 Angelo ZERR.
3+
* All rights reserved. This program and the accompanying materials
4+
* are made available under the terms of the Eclipse Public License v1.0
5+
* which accompanies this distribution, and is available at
6+
* http://www.eclipse.org/legal/epl-v10.html
7+
*
8+
* Contributors:
9+
* Angelo Zerr <[email protected]> - initial API and implementation
10+
*/
11+
package ts;
12+
13+
import java.util.Collections;
14+
import java.util.HashMap;
15+
import java.util.Map;
16+
17+
/**
18+
* TypeScript model kind modifier.
19+
*
20+
* @see https://github.com/Microsoft/TypeScript/blob/master/src/services/types.ts
21+
*
22+
*/
23+
public enum ScriptElementKindModifier {
24+
25+
none(""), publicMemberModifier("public"), privateMemberModifier("private"), protectedMemberModifier(
26+
"protected"), exportedModifier(
27+
"export"), ambientModifier("declare"), staticModifier("static"), abstractModifier("abstract");
28+
29+
private static final Map<String, ScriptElementKindModifier> cache = Collections.unmodifiableMap(initializeCache());
30+
31+
private final String name;
32+
33+
private ScriptElementKindModifier(String name) {
34+
this.name = name;
35+
}
36+
37+
private static Map<String, ScriptElementKindModifier> initializeCache() {
38+
Map<String, ScriptElementKindModifier> cache = new HashMap<>();
39+
ScriptElementKindModifier[] values = ScriptElementKindModifier.values();
40+
for (int i = 0; i < values.length; i++) {
41+
ScriptElementKindModifier value = values[i];
42+
cache.put(value.getName(), value);
43+
}
44+
return cache;
45+
}
46+
47+
public String getName() {
48+
return name;
49+
}
50+
51+
public static ScriptElementKindModifier getKindModifier(String modifier) {
52+
return cache.get(modifier);
53+
}
54+
}

‎core/ts.core/src/ts/client/completions/CompletionEntry.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.util.concurrent.TimeUnit;
1515

1616
import ts.TypeScriptException;
17-
import ts.TypeScriptKind;
17+
import ts.ScriptElementKind;
1818
import ts.client.IKindProvider;
1919
import ts.client.ITypeScriptServiceClient;
2020
import ts.client.TextSpan;
@@ -137,9 +137,9 @@ public TextSpan getReplacementSpan() {
137137

138138
public boolean isFunction() {
139139
if (isFunction == null) {
140-
TypeScriptKind tsKind = TypeScriptKind.getKind(getKind());
141-
isFunction = (tsKind != null && (TypeScriptKind.CONSTRUCTOR == tsKind || TypeScriptKind.FUNCTION == tsKind
142-
|| TypeScriptKind.METHOD == tsKind));
140+
ScriptElementKind tsKind = ScriptElementKind.getKind(getKind());
141+
isFunction = (tsKind != null && (ScriptElementKind.CONSTRUCTOR == tsKind || ScriptElementKind.FUNCTION == tsKind
142+
|| ScriptElementKind.METHOD == tsKind));
143143
}
144144
return isFunction;
145145
}

‎eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/internal/ui/editor/contentassist/TypeScriptCompletionProposalComputer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.eclipse.wst.jsdt.ui.text.java.IJavaCompletionProposalComputer;
2727
import org.eclipse.wst.jsdt.ui.text.java.JavaContentAssistInvocationContext;
2828

29-
import ts.TypeScriptKind;
29+
import ts.ScriptElementKind;
3030
import ts.TypeScriptNoContentAvailableException;
3131
import ts.eclipse.ide.core.resources.IIDETypeScriptProject;
3232
import ts.eclipse.ide.core.utils.TypeScriptResourceUtil;
@@ -72,7 +72,7 @@ public List computeCompletionProposals(ContentAssistInvocationContext context, I
7272
new JSDTCompletionProposalFactory(position, p, context.getViewer()))
7373
.get(5000, TimeUnit.MILLISECONDS).stream()
7474
.filter(entry -> entry.updatePrefix(p)
75-
&& TypeScriptKind.getKind(entry.getKind()) != TypeScriptKind.WARNING)
75+
&& ScriptElementKind.getKind(entry.getKind()) != ScriptElementKind.WARNING)
7676
.collect(Collectors.toList());
7777
}
7878
}

‎eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/codelens/TypeScriptImplementationsCodeLensProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.eclipse.jface.text.provisional.codelens.ICodeLens;
1111
import org.eclipse.jface.text.provisional.codelens.Range;
1212

13-
import ts.TypeScriptKind;
13+
import ts.ScriptElementKind;
1414
import ts.client.FileSpan;
1515
import ts.client.navbar.NavigationBarItem;
1616
import ts.eclipse.ide.core.resources.IIDETypeScriptFile;
@@ -59,7 +59,7 @@ public ICodeLens resolveCodeLens(ITextViewer textViewer, ICodeLens cl) {
5959

6060
@Override
6161
protected Range extractSymbol(IIDETypeScriptFile document, NavigationBarItem item, NavigationBarItem parent) {
62-
TypeScriptKind tsKind = TypeScriptKind.getKind(item.getKind());
62+
ScriptElementKind tsKind = ScriptElementKind.getKind(item.getKind());
6363
if (tsKind != null) {
6464
switch (tsKind) {
6565
case INTERFACE:

‎eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/codelens/TypeScriptReferencesCodeLensProvider.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.eclipse.jface.text.provisional.codelens.ICodeLens;
1111
import org.eclipse.jface.text.provisional.codelens.Range;
1212

13-
import ts.TypeScriptKind;
13+
import ts.ScriptElementKind;
1414
import ts.client.navbar.NavigationBarItem;
1515
import ts.client.references.ReferencesResponseItem;
1616
import ts.eclipse.ide.core.resources.IIDETypeScriptFile;
@@ -90,11 +90,11 @@ public ICodeLens resolveCodeLens(ITextViewer textViewer, ICodeLens cl) {
9090

9191
@Override
9292
protected Range extractSymbol(IIDETypeScriptFile document, NavigationBarItem item, NavigationBarItem parent) {
93-
if (parent != null && TypeScriptKind.ENUM.equals(TypeScriptKind.getKind(parent.getKind()))) {
93+
if (parent != null && ScriptElementKind.ENUM.equals(ScriptElementKind.getKind(parent.getKind()))) {
9494
return super.getSymbolRange(document, item);
9595
}
9696

97-
TypeScriptKind tsKind = TypeScriptKind.getKind(item.getKind());
97+
ScriptElementKind tsKind = ScriptElementKind.getKind(item.getKind());
9898
if (tsKind != null) {
9999

100100
switch (tsKind) {

‎eclipse/ts.eclipse/src/ts/eclipse/jface/images/TypeScriptImagesRegistry.java‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
import org.eclipse.jface.resource.JFaceResources;
2020
import org.eclipse.swt.graphics.Image;
2121

22-
import ts.TypeScriptKind;
22+
import ts.ScriptElementKind;
23+
import ts.ScriptElementKindModifier;
2324
import ts.client.IKindProvider;
2425
import ts.utils.StringUtils;
2526

@@ -147,13 +148,13 @@ public static ImageDescriptor getTypeScriptImageDescriptor(String kind, String k
147148
}
148149

149150
private static String getImageKey(String kind, String kindModifiers, String containerKind) {
150-
TypeScriptKind tsKind = TypeScriptKind.getKind(kind);
151+
ScriptElementKind tsKind = ScriptElementKind.getKind(kind);
151152
if (tsKind == null) {
152153
return null;
153154
}
154-
List<TypeScriptKind> parts = getParts(kindModifiers);
155+
List<ScriptElementKindModifier> parts = getParts(kindModifiers);
155156
boolean isInner = !StringUtils.isEmpty(containerKind);
156-
boolean isStatic = parts.contains(TypeScriptKind.STATIC);
157+
boolean isStatic = parts.contains(ScriptElementKindModifier.staticModifier);
157158
String imageKey = null;
158159

159160
switch (tsKind) {
@@ -211,25 +212,26 @@ private static String getImageKey(String kind, String kindModifiers, String cont
211212
return imageKey;
212213
}
213214

214-
private static List<TypeScriptKind> getParts(String kindModifiers) {
215+
private static List<ScriptElementKindModifier> getParts(String kindModifiers) {
215216
if (StringUtils.isEmpty(kindModifiers)) {
216217
return Collections.emptyList();
217218
}
218219
String[] parts = kindModifiers.split(",");
219-
List<TypeScriptKind> kinds = new ArrayList<TypeScriptKind>();
220+
List<ScriptElementKindModifier> kinds = new ArrayList<ScriptElementKindModifier>();
220221
for (int i = 0; i < parts.length; i++) {
221-
TypeScriptKind tsKind = TypeScriptKind.getKind(parts[i]);
222-
if (tsKind != null) {
223-
kinds.add(tsKind);
222+
ScriptElementKindModifier modifier = ScriptElementKindModifier.getKindModifier(parts[i]);
223+
if (modifier != null) {
224+
kinds.add(modifier);
224225
}
225226
}
226227
return kinds;
227228
}
228229

229-
private static String getKey(List<TypeScriptKind> parts, String defaultKey, String privateKey, String publicKey) {
230-
if (parts.contains(TypeScriptKind.PRIVATE)) {
230+
private static String getKey(List<ScriptElementKindModifier> parts, String defaultKey, String privateKey,
231+
String publicKey) {
232+
if (parts.contains(ScriptElementKindModifier.privateMemberModifier)) {
231233
return privateKey;
232-
} else if (parts.contains(TypeScriptKind.PUBLIC)) {
234+
} else if (parts.contains(ScriptElementKindModifier.publicMemberModifier)) {
233235
return publicKey;
234236
}
235237
return defaultKey;

0 commit comments

Comments
 (0)