Merge pull request #33777 from vespa-engine/theodorkl/YQLCompletions

Theodorkl/YQL completions

Author: Mangern

integration/schema-language-server/language-server/src/main/java/ai/vespa/schemals/SchemaTextDocumentService.java

@@ -61,8 +61,8 @@
 import ai.vespa.schemals.context.EventDocumentContext;
 import ai.vespa.schemals.context.InvalidContextException;
 import ai.vespa.schemals.index.SchemaIndex;
+import ai.vespa.schemals.lsp.common.completion.CommonCompletion;
 import ai.vespa.schemals.lsp.schema.codeaction.SchemaCodeAction;
-import ai.vespa.schemals.lsp.schema.completion.SchemaCompletion;
 import ai.vespa.schemals.lsp.schema.definition.SchemaDefinition;
 import ai.vespa.schemals.lsp.schema.documentsymbols.SchemaDocumentSymbols;
 import ai.vespa.schemals.lsp.schema.hover.SchemaHover;
@@ -99,7 +99,7 @@ public CompletableFuture<Either<List<CompletionItem>, CompletionList>> completio
                 ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
                 PrintStream errorLogger = new PrintStream(outputStream);
                 Either<List<CompletionItem>, CompletionList> result =
-                    Either.forLeft(SchemaCompletion.getCompletionItems(eventContextCreator.createContext(completionParams), errorLogger));
+                    Either.forLeft(CommonCompletion.getCompletionItems(eventContextCreator.createContext(completionParams), errorLogger));
 
                 if (outputStream.size() > 0) {
                     schemaMessageHandler.logMessage(MessageType.Error, 

integration/schema-language-server/language-server/src/main/java/ai/vespa/schemals/lsp/common/completion/CommonCompletion.java

@@ -0,0 +1,31 @@
+package ai.vespa.schemals.lsp.common.completion;
+
+import java.io.PrintStream;
+import java.util.ArrayList;
+
+import org.eclipse.lsp4j.CompletionItem;
+
+import ai.vespa.schemals.common.StringUtils;
+import ai.vespa.schemals.context.EventCompletionContext;
+import ai.vespa.schemals.lsp.schema.completion.SchemaCompletion;
+import ai.vespa.schemals.lsp.yqlplus.completion.YQLCompletion;
+import ai.vespa.schemals.schemadocument.DocumentManager.DocumentType;
+
+/**
+ * Responsible for LSP textDocument/completion requests.
+ */
+public class CommonCompletion {
+
+    public static ArrayList<CompletionItem> getCompletionItems(EventCompletionContext context, PrintStream errorLogger) {
+
+        if (StringUtils.isInsideComment(context.document.getCurrentContent(), context.position)) {
+            return new ArrayList<CompletionItem>();
+        }
+
+        if (context.document.getDocumentType() == DocumentType.SCHEMA || context.document.getDocumentType() == DocumentType.PROFILE) {
+            return SchemaCompletion.getCompletionItems(context, errorLogger);
+        }
+
+        return YQLCompletion.getCompletionItems(context, errorLogger);
+    }
+}

integration/schema-language-server/language-server/src/main/java/ai/vespa/schemals/lsp/schema/completion/provider/CompletionProvider.java renamed to integration/schema-language-server/language-server/src/main/java/ai/vespa/schemals/lsp/common/completion/CompletionProvider.java

@@ -1,4 +1,4 @@
-package ai.vespa.schemals.lsp.schema.completion.provider;
+package ai.vespa.schemals.lsp.common.completion;
 
 import java.util.List;
 

integration/schema-language-server/language-server/src/main/java/ai/vespa/schemals/lsp/schema/completion/utils/CompletionUtils.java renamed to integration/schema-language-server/language-server/src/main/java/ai/vespa/schemals/lsp/common/completion/CompletionUtils.java

@@ -1,4 +1,4 @@
-package ai.vespa.schemals.lsp.schema.completion.utils;
+package ai.vespa.schemals.lsp.common.completion;
 
 import java.util.ArrayList;
 import java.util.List;

integration/schema-language-server/language-server/src/main/java/ai/vespa/schemals/lsp/schema/completion/SchemaCompletion.java

@@ -8,7 +8,7 @@
 import ai.vespa.schemals.common.StringUtils;
 import ai.vespa.schemals.context.EventCompletionContext;
 import ai.vespa.schemals.lsp.schema.completion.provider.BodyKeywordCompletion;
-import ai.vespa.schemals.lsp.schema.completion.provider.CompletionProvider;
+import ai.vespa.schemals.lsp.common.completion.CompletionProvider;
 import ai.vespa.schemals.lsp.schema.completion.provider.EmptyFileCompletion;
 import ai.vespa.schemals.lsp.schema.completion.provider.FieldsCompletion;
 import ai.vespa.schemals.lsp.schema.completion.provider.IndexingLangaugeCompletion;

integration/schema-language-server/language-server/src/main/java/ai/vespa/schemals/lsp/schema/completion/provider/BodyKeywordCompletion.java

@@ -11,7 +11,8 @@
 import org.eclipse.lsp4j.Range;
 
 import ai.vespa.schemals.context.EventCompletionContext;
-import ai.vespa.schemals.lsp.schema.completion.utils.CompletionUtils;
+import ai.vespa.schemals.lsp.common.completion.CompletionProvider;
+import ai.vespa.schemals.lsp.common.completion.CompletionUtils;
 import ai.vespa.schemals.lsp.schema.hover.SchemaHover;
 import ai.vespa.schemals.parser.ast.NL;
 import ai.vespa.schemals.parser.ast.RootRankProfile;
@@ -39,7 +40,6 @@
 import ai.vespa.schemals.parser.ast.weakandElm;
 import ai.vespa.schemals.tree.CSTUtils;
 import ai.vespa.schemals.tree.Node;
-import ai.vespa.schemals.tree.SchemaNode;
 
 public class BodyKeywordCompletion implements CompletionProvider {
     // Currently key is the classLeafIdentifierString of a node with a body

integration/schema-language-server/language-server/src/main/java/ai/vespa/schemals/lsp/schema/completion/provider/EmptyFileCompletion.java

@@ -8,7 +8,8 @@
 import ai.vespa.schemals.common.FileUtils;
 import ai.vespa.schemals.parser.ast.NL;
 import ai.vespa.schemals.context.EventCompletionContext;
-import ai.vespa.schemals.lsp.schema.completion.utils.CompletionUtils;
+import ai.vespa.schemals.lsp.common.completion.CompletionProvider;
+import ai.vespa.schemals.lsp.common.completion.CompletionUtils;
 import ai.vespa.schemals.schemadocument.DocumentManager;
 import ai.vespa.schemals.tree.Node;
 import ai.vespa.schemals.tree.SchemaNode;

integration/schema-language-server/language-server/src/main/java/ai/vespa/schemals/lsp/schema/completion/provider/FieldsCompletion.java

@@ -14,7 +14,8 @@
 import ai.vespa.schemals.context.EventCompletionContext;
 import ai.vespa.schemals.index.Symbol;
 import ai.vespa.schemals.index.Symbol.SymbolType;
-import ai.vespa.schemals.lsp.schema.completion.utils.CompletionUtils;
+import ai.vespa.schemals.lsp.common.completion.CompletionProvider;
+import ai.vespa.schemals.lsp.common.completion.CompletionUtils;
 import ai.vespa.schemals.parser.Token.TokenType;
 import ai.vespa.schemals.schemadocument.SchemaDocument;
 import ai.vespa.schemals.tree.CSTUtils;

integration/schema-language-server/language-server/src/main/java/ai/vespa/schemals/lsp/schema/completion/provider/FixedKeywordBodies.java

@@ -6,7 +6,7 @@
 import org.eclipse.lsp4j.CompletionItemKind;
 
 import ai.vespa.schemals.common.LocaleList;
-import ai.vespa.schemals.lsp.schema.completion.utils.CompletionUtils;
+import ai.vespa.schemals.lsp.common.completion.CompletionUtils;
 import ai.vespa.schemals.parser.Node;
 import ai.vespa.schemals.parser.Token.TokenType;
 import ai.vespa.schemals.parser.ast.attributeElm;

integration/schema-language-server/language-server/src/main/java/ai/vespa/schemals/lsp/schema/completion/provider/IndexingLangaugeCompletion.java

@@ -6,7 +6,8 @@
 import org.eclipse.lsp4j.Position;
 
 import ai.vespa.schemals.context.EventCompletionContext;
-import ai.vespa.schemals.lsp.schema.completion.utils.CompletionUtils;
+import ai.vespa.schemals.lsp.common.completion.CompletionProvider;
+import ai.vespa.schemals.lsp.common.completion.CompletionUtils;
 import ai.vespa.schemals.parser.ast.COLON;
 import ai.vespa.schemals.parser.ast.INDEXING;
 import ai.vespa.schemals.tree.CSTUtils;