add value completion.

language-server/src/build-server.ts

@@ -8,6 +8,8 @@ import { SchemaValidation } from "./features/SchemaValidation.ts";
 import { Formatting } from "./features/Formatting.ts";
 import { Hover } from "./features/Hover.ts";
 import { Completion } from "./features/Completion.ts";
+import { PropertyCompletion } from "./features/PropertyCompletion.ts";
+import { ValueCompletion } from "./features/ValueCompletion.ts";
 import { FoldingRanges } from "./features/FoldingRanges.ts";
 import { DocumentSymbols } from "./features/DocumentSymbols.ts";
 import { SelectionRanges } from "./features/SelectionRanges.ts";
@@ -39,7 +41,10 @@ export const buildServer = (connection: Connection): Server => {
 
   new Formatting(server, documents);
   new Hover(server, documents);
-  new Completion(server, documents);
+  new Completion(server, documents, [
+    new PropertyCompletion(),
+    new ValueCompletion()
+  ]);
   new FoldingRanges(server, documents);
   new DocumentSymbols(server, documents);
   new SelectionRanges(server, documents);

language-server/src/features/Completion.ts

@@ -1,11 +1,14 @@
-import { CompletionItemKind } from "vscode-languageserver";
-import { JsonDocuments } from "../services/JsonDocuments.ts";
-
+import type { CompletionItem, Position, ServerCapabilities } from "vscode-languageserver";
 import type { Server } from "../services/Server.ts";
-import type { CompletionItem, ServerCapabilities } from "vscode-languageserver";
+import type { JsonDocument } from "../models/JsonDocument.ts";
+import type { JsonDocuments } from "../services/JsonDocuments.ts";
+
+export type CompletionsProvider = {
+  getCompletions(jsonDocument: JsonDocument, position: Position): Promise<CompletionItem[]>;
+};
 
 export class Completion {
-  constructor(server: Server, jsonDocuments: JsonDocuments) {
+  constructor(server: Server, jsonDocuments: JsonDocuments, providers: CompletionsProvider[]) {
     server.onInitialize(() => {
       const serverCapabilities: ServerCapabilities = {
         completionProvider: {
@@ -18,34 +21,15 @@ export class Completion {
       };
     });
 
-    server.onCompletion(async (params) => {
-      const jsonDocument = jsonDocuments.get(params.textDocument.uri)!;
-      const keyNode = jsonDocument.findNodeAtPosition(params.position)!;
-      const propertyNode = keyNode.parent;
-
-      if (propertyNode?.type !== "property" || propertyNode.children![0] !== keyNode) {
-        return [];
-      }
-
-      const objectNode = propertyNode.parent!;
-
-      const propertyNames = await jsonDocument.getDeclaredProperties(objectNode);
-      for (const node of objectNode.children!) {
-        if (node === propertyNode) {
-          continue;
-        }
+    server.onCompletion(async ({ textDocument, position }) => {
+      const jsonDocument = jsonDocuments.get(textDocument.uri)!;
 
-        propertyNames.delete(node.children![0].value);
+      const completions: CompletionItem[] = [];
+      for (const provider of providers) {
+        completions.push(...await provider.getCompletions(jsonDocument, position));
       }
 
-      const completionItems: CompletionItem[] = [];
-      for (const propertyName of propertyNames) {
-        completionItems.push({
-          label: propertyName,
-          kind: CompletionItemKind.Property
-        });
-      }
-      return completionItems;
+      return completions;
     });
   }
 }