Skip to content

Commit 8df940b

Browse files
committed
Temporarily disable namespace autocompletion
1 parent 3ed1ea6 commit 8df940b

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

src/main/java/org/nette/latte/completion/providers/LattePhpCompletionProvider.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ protected void addCompletions(
7070
if (isInClassDefinition(element)) {
7171
if (allowHeavy) {
7272
classCompletionProvider.addCompletions(parameters, context, result);
73-
namespaceCompletionProvider.addCompletions(parameters, context, result);
73+
//namespaceCompletionProvider.addCompletions(parameters, context, result);
7474
} else {
7575
result.restartCompletionOnAnyPrefixChange();
7676
}
@@ -84,7 +84,7 @@ protected void addCompletions(
8484
if (parentType || parentTemplateType || isInTypeDefinition(current)) {
8585
if (allowHeavy) {
8686
classCompletionProvider.addCompletions(parameters, context, result);
87-
namespaceCompletionProvider.addCompletions(parameters, context, result);
87+
//namespaceCompletionProvider.addCompletions(parameters, context, result);
8888
} else {
8989
result.restartCompletionOnAnyPrefixChange();
9090
}
@@ -98,7 +98,7 @@ protected void addCompletions(
9898
if (invocation >= 2) {
9999
functionCompletionProvider.addCompletions(parameters, context, result);
100100
classCompletionProvider.addCompletions(parameters, context, result);
101-
namespaceCompletionProvider.addCompletions(parameters, context, result);
101+
//namespaceCompletionProvider.addCompletions(parameters, context, result);
102102
}
103103
return;
104104
}
@@ -107,7 +107,7 @@ protected void addCompletions(
107107
variableCompletionProvider.addCompletions(parameters, context, result);
108108
if (allowHeavy) {
109109
classCompletionProvider.addCompletions(parameters, context, result);
110-
namespaceCompletionProvider.addCompletions(parameters, context, result);
110+
//namespaceCompletionProvider.addCompletions(parameters, context, result);
111111
functionCompletionProvider.addCompletions(parameters, context, result);
112112
} else {
113113
result.restartCompletionOnAnyPrefixChange();

src/main/java/org/nette/latte/completion/providers/LattePhpNamespaceCompletionProvider.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,26 @@ protected void addCompletions(@NotNull CompletionParameters params, ProcessingCo
2727
return;
2828
}
2929

30+
/*
31+
32+
Maybe autocomplete namespaces only if \ is before?
33+
Currently it's bugged, if you type App\Mod.. and accept the Model namespace,
34+
you'll end with App\App\Model, that's why it is disabled for now
35+
36+
37+
String prefix = result.getPrefixMatcher().getPrefix();
38+
boolean hasBackslash = false;
39+
int offset = params.getOffset();
40+
int candidateIndex = offset - prefix.length() - 1;
41+
CharSequence chars = params.getEditor().getDocument().getCharsSequence();
42+
if (candidateIndex >= 0 && candidateIndex < chars.length()) {
43+
hasBackslash = chars.charAt(candidateIndex) == '\\';
44+
}
45+
46+
if (!hasBackslash) {
47+
return;
48+
}*/
49+
3050
String namespaceName = getNamespaceName(curr);
3151
Collection<String> namespaceNames = LattePhpUtil.getAllExistingNamespacesByName(curr.getProject(), namespaceName);
3252
Collection<PhpNamespace> namespaces = LattePhpUtil.getAlNamespaces(curr.getProject(), namespaceNames);

0 commit comments

Comments
 (0)