10000 Filter "warning" kind for completion. · rubensa/typescript.java@6315073 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6315073

Browse files
angelozerrangelozerr
committed
Filter "warning" kind for completion.
1 parent a2d675b commit 6315073

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

‎core/ts.core/src/ts/TypeScriptKind.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
*/
1717
public enum TypeScriptKind {
1818

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;
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;
2020

2121
public static TypeScriptKind getKind(String kind) {
2222
try {
2323
return TypeScriptKind.valueOf(kind.toUpperCase());
24-
} catch (Throwable e) {
25-
return null;
24+
} catch (Exception e) {
25+
return TypeScriptKind.WARNING;
2626
}
2727
}
2828
}

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +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;
2930
import ts.TypeScriptNoContentAvailableException;
3031
import ts.eclipse.ide.core.resources.IIDETypeScriptProject;
3132
import ts.eclipse.ide.core.utils.TypeScriptResourceUtil;
@@ -44,7 +45,7 @@ public class TypeScriptCompletionProposalComputer
4445
implements IJavaCompletionProposalComputer/* , ICompletionProposalComputer */ {
4546

4647
public List computeCompletionProposals(ContentAssistInvocationContext context, IProgressMonitor monitor) {
47-
IResource resource = null;
48+
IResource resource = null;
4849
if (context instanceof TypeScriptContentAssistInvocationContext) {
4950
TypeScriptContentAssistInvocationContext tsContext = (TypeScriptContentAssistInvocationContext) context;
5051
resource = tsContext.getResource();
@@ -66,8 +67,12 @@ public List computeCompletionProposals(ContentAssistInvocationContext context, I
6667
CharSequence prefix = context.computeIdentifierPrefix();
6768

6869
String p = prefix != null ? prefix.toString() : "";
69-
return tsFile.completions(position, new JSDTCompletionProposalFactory(position, p, context.getViewer()))
70-
.get(5000, TimeUnit.MILLISECONDS).stream().filter(entry -> entry.updatePrefix(p))
70+
return tsFile
71+
.completions(position,
72+
new JSDTCompletionProposalFactory(position, p, context.getViewer()))
73+
.get(5000, TimeUnit.MILLISECONDS).stream()
74+
.filter(entry -> entry.updatePrefix(p)
75+
&& TypeScriptKind.getKind(entry.getKind()) != TypeScriptKind.WARNING)
7176
.collect(Collectors.toList());
7277
}
7378
}

0 commit comments

Comments
 (0)
0