summaryrefslogtreecommitdiffstats
path: root/integration
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2022-02-12 18:57:33 +0100
committerJon Bratseth <bratseth@gmail.com>2022-02-12 18:57:33 +0100
commitd33137729659a3e51020a3968758d1e6bab75ca5 (patch)
tree13803b37508f1db04cacd5d8b3476ff4e4022c00 /integration
parentd4bf9c688f38b3bbb4a6aa881f54dba96a12071a (diff)
Cleanup
Diffstat (limited to 'integration')
-rw-r--r--integration/intellij/src/main/java/ai/vespa/intellij/schema/model/Schema.java1
-rw-r--r--integration/intellij/src/main/java/ai/vespa/intellij/schema/utils/Tokens.java4
2 files changed, 1 insertions, 4 deletions
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/model/Schema.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/model/Schema.java
index 7ad91907b22..6479f48a214 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/model/Schema.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/model/Schema.java
@@ -43,7 +43,6 @@ public class Schema {
public Optional<Schema> inherited() {
if (inherited != null) return inherited;
- System.out.println("----------- starting schema inherits");
return inherited = AST.inherits(PsiTreeUtil.collectElementsOfType(definition, SdSchemaDefinition.class).stream().findFirst().get())
.stream()
.findFirst() // Only one schema can be inherited; ignore any following
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/utils/Tokens.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/utils/Tokens.java
index f5f80baf854..5d4ae376c77 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/utils/Tokens.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/utils/Tokens.java
@@ -4,9 +4,7 @@ package ai.vespa.intellij.schema.utils;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.impl.source.tree.CompositeElement;
import com.intellij.psi.impl.source.tree.LeafPsiElement;
-import com.intellij.psi.impl.source.tree.TreeElement;
import com.intellij.psi.tree.IElementType;
import java.util.Arrays;
@@ -62,7 +60,7 @@ public class Tokens {
/** Returns whether the current token is an element */
public boolean isElement() {
- return current() instanceof TreeElement;
+ return current() instanceof LeafPsiElement;
}
/** Returns the current token if it is of the required type and throws otherwise. */