@neo4j-cypher/language-server 2.0.0-next.31 → 2.0.0-next.32

package/dist/server.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.languageService = void 0;
 const node_1 = require("vscode-languageserver/node");
 const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
 const language_support_1 = require("@neo4j-cypher/language-support");
@@ -11,12 +12,15 @@ const autocompletion_1 = require("./autocompletion");
 const formatting_1 = require("./formatting");
 const linting_1 = require("./linting");
 const signatureHelp_1 = require("./signatureHelp");
-const syntaxColouring_1 = require("./syntaxColouring");
+const syntaxHighlighting_1 = require("./syntaxHighlighting");
 const workerpool_1 = __importDefault(require("workerpool"));
 const lint_worker_1 = require("@neo4j-cypher/lint-worker");
 const path_1 = require("path");
 const defaultWorkerPath = (0, path_1.join)(__dirname, 'lintWorker.cjs');
 let workerPath = defaultWorkerPath;
+exports.languageService = new language_support_1.CypherLanguageService({
+    consoleCommandsEnabled: false,
+});
 class SymbolFetcher {
     processing = false;
     nextJob;
@@ -53,7 +57,7 @@ class SymbolFetcher {
                 //if this.nextJob has new doc, our result is no longer valid
                 result.symbolTables &&
                     !(this.nextJob && this.nextJob.uri != docUri)) {
-                    language_support_1.parserWrapper.setSymbolsInfo({
+                    exports.languageService.setSymbolsInfo({
                         query,
                         symbolTables: result.symbolTables,
                     }, async (symbolTables) => await connection.sendNotification('symbolTableDone', {
@@ -108,7 +112,7 @@ connection.onInitialize(() => {
             },
             semanticTokensProvider: {
                 documentSelector: [{ language: 'cypher' }],
-                legend: language_support_1.syntaxColouringLegend,
+                legend: language_support_1.syntaxHighlightingLegend,
                 range: false,
                 full: {
                     delta: false,
@@ -128,7 +132,7 @@ connection.onInitialized(() => {
     });
     const registrationOptions = {
         documentSelector: [{ language: 'cypher' }],
-        legend: language_support_1.syntaxColouringLegend,
+        legend: language_support_1.syntaxHighlightingLegend,
         range: false,
         full: {
             delta: false,
@@ -142,8 +146,8 @@ connection.onDidChangeConfiguration((params) => {
     relintAllDocuments();
 });
 documents.onDidChangeContent((change) => lintSingleDocument(change.document));
-// Trigger the syntax colouring
-connection.languages.semanticTokens.on((0, syntaxColouring_1.applySyntaxColouringForDocument)(documents));
+// Trigger the syntax highlighting
+connection.languages.semanticTokens.on((0, syntaxHighlighting_1.highlightSyntaxForDocument)(documents));
 // Trigger the signature help, providing info about functions / procedures
 connection.onSignatureHelp((0, signatureHelp_1.doSignatureHelp)(documents, neo4jSchemaPoller));
 // Trigger the auto completion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neo4j-cypher/language-server",
-  "version": "2.0.0-next.31",
+  "version": "2.0.0-next.32",
   "description": "Cypher Language Server",
   "keywords": [
     "cypher",
@@ -36,9 +36,9 @@
     "vscode-languageserver": "^8.1.0",
     "vscode-languageserver-textdocument": "^1.0.8",
     "workerpool": "^9.3.3",
-    "@neo4j-cypher/query-tools": "2.0.0-next.30",
-    "@neo4j-cypher/language-support": "2.0.0-next.30",
-    "@neo4j-cypher/lint-worker": "1.10.1-next.7"
+    "@neo4j-cypher/language-support": "2.0.0-next.31",
+    "@neo4j-cypher/query-tools": "2.0.0-next.31",
+    "@neo4j-cypher/lint-worker": "1.10.1-next.8"
   },
   "devDependencies": {
     "@types/lodash.debounce": "^4.0.9",

package/src/autocompletion.ts

@@ -6,12 +6,10 @@ import {
 } from 'vscode-languageserver/node';
 
 import type { CompletionItem } from '@neo4j-cypher/language-support';
-import {
-  autocomplete,
-  shouldAutoCompleteYield,
-} from '@neo4j-cypher/language-support';
+import { shouldAutoCompleteYield } from '@neo4j-cypher/language-support';
 import { Neo4jSchemaPoller } from '@neo4j-cypher/query-tools';
 import { TextDocument } from 'vscode-languageserver-textdocument';
+import { languageService } from './server';
 
 export function doAutoCompletion(
   documents: TextDocuments<TextDocument>,
@@ -30,11 +28,15 @@ export function doAutoCompletion(
     const manualOrCharacterOrInwordTriggered =
       completionParams.context?.triggerCharacter !== ' ';
     if (yieldTriggered || manualOrCharacterOrInwordTriggered) {
-      const completions: CompletionItem[] = autocomplete(
+      const completions: CompletionItem[] = languageService.autocomplete(
         textDocument.getText(),
         neo4j.metadata?.dbSchema ?? {},
-        offset,
-        completionParams.context.triggerKind === CompletionTriggerKind.Invoked,
+        {
+          caretPosition: offset,
+          manual:
+            completionParams.context.triggerKind ===
+            CompletionTriggerKind.Invoked,
+        },
       );
 
       const result = completions.map((item) => {

package/src/linting.ts

@@ -1,7 +1,5 @@
 import {
-  _internalFeatureFlags,
   clampUnsafePositions,
-  parserWrapper,
   SymbolTable,
 } from '@neo4j-cypher/language-support';
 import { Neo4jSchemaPoller } from '@neo4j-cypher/query-tools';
@@ -15,6 +13,7 @@ import {
   LinterTask,
   LintWorker,
 } from '@neo4j-cypher/lint-worker';
+import { languageService } from './server';
 
 const defaultWorkerPath = join(__dirname, 'lintWorker.cjs');
 
@@ -59,11 +58,9 @@ async function rawLintDocument(
     const proxyWorker = (await pool.proxy()) as unknown as LintWorker;
 
     const fixedDbSchema = convertDbSchema(dbSchema, linterVersion);
-    lastSemanticJob = proxyWorker.lintCypherQuery(
-      query,
-      fixedDbSchema,
-      _internalFeatureFlags,
-    );
+    lastSemanticJob = proxyWorker.lintCypherQuery(query, fixedDbSchema, {
+      consoleCommands: false,
+    });
     const result = await lastSemanticJob;
 
     //marks the entire text if any position is negative
@@ -74,7 +71,7 @@ async function rawLintDocument(
 
     // Pass the computed symbol tables to the parser
     if (result.symbolTables) {
-      parserWrapper.setSymbolsInfo(
+      languageService.setSymbolsInfo(
         {
           query,
           symbolTables: result.symbolTables,

package/src/server.ts

@@ -13,16 +13,16 @@ import {
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import {
   DbSchema,
-  parserWrapper,
   SymbolTable,
-  syntaxColouringLegend,
+  syntaxHighlightingLegend,
+  CypherLanguageService,
 } from '@neo4j-cypher/language-support';
 import { Neo4jSchemaPoller } from '@neo4j-cypher/query-tools';
 import { doAutoCompletion } from './autocompletion';
 import { formatDocument } from './formatting';
 import { cleanupWorkers, lintDocument, setLintWorker } from './linting';
 import { doSignatureHelp } from './signatureHelp';
-import { applySyntaxColouringForDocument } from './syntaxColouring';
+import { highlightSyntaxForDocument } from './syntaxHighlighting';
 import {
   LintWorkerSettings,
   Neo4jConnectionSettings,
@@ -35,6 +35,9 @@ import { join } from 'path';
 
 const defaultWorkerPath: string = join(__dirname, 'lintWorker.cjs');
 let workerPath = defaultWorkerPath;
+export const languageService = new CypherLanguageService({
+  consoleCommandsEnabled: false,
+});
 
 class SymbolFetcher {
   private processing = false;
@@ -86,7 +89,7 @@ class SymbolFetcher {
           result.symbolTables &&
           !(this.nextJob && this.nextJob.uri != docUri)
         ) {
-          parserWrapper.setSymbolsInfo(
+          languageService.setSymbolsInfo(
             {
               query,
               symbolTables: result.symbolTables,
@@ -158,7 +161,7 @@ connection.onInitialize(() => {
       },
       semanticTokensProvider: {
         documentSelector: [{ language: 'cypher' }],
-        legend: syntaxColouringLegend,
+        legend: syntaxHighlightingLegend,
         range: false,
         full: {
           delta: false,
@@ -181,7 +184,7 @@ connection.onInitialized(() => {
 
   const registrationOptions: SemanticTokensRegistrationOptions = {
     documentSelector: [{ language: 'cypher' }],
-    legend: syntaxColouringLegend,
+    legend: syntaxHighlightingLegend,
     range: false,
     full: {
       delta: false,
@@ -201,10 +204,8 @@ connection.onDidChangeConfiguration((params) => {
 
 documents.onDidChangeContent((change) => lintSingleDocument(change.document));
 
-// Trigger the syntax colouring
-connection.languages.semanticTokens.on(
-  applySyntaxColouringForDocument(documents),
-);
+// Trigger the syntax highlighting
+connection.languages.semanticTokens.on(highlightSyntaxForDocument(documents));
 
 // Trigger the signature help, providing info about functions / procedures
 connection.onSignatureHelp(doSignatureHelp(documents, neo4jSchemaPoller));

package/src/signatureHelp.ts

@@ -1,4 +1,3 @@
-import { signatureHelp } from '@neo4j-cypher/language-support';
 import {
   SignatureHelp,
   SignatureHelpParams,
@@ -7,6 +6,7 @@ import {
 
 import { Neo4jSchemaPoller } from '@neo4j-cypher/query-tools';
 import { TextDocument } from 'vscode-languageserver-textdocument';
+import { languageService } from './server';
 
 export const emptyResult: SignatureHelp = {
   signatures: [],
@@ -26,10 +26,10 @@ export function doSignatureHelp(
     const position = params.position;
     const offset = textDocument.offsetAt(position);
 
-    return signatureHelp(
+    return languageService.getSignatureHelp(
       textDocument.getText(),
       neo4j.metadata?.dbSchema ?? {},
-      offset,
+      { caretPosition: offset },
     );
   };
 }

package/src/{syntaxColouring.ts → syntaxHighlighting.ts}

@@ -1,22 +1,20 @@
-import {
-  applySyntaxColouring,
-  mapCypherToSemanticTokenIndex,
-} from '@neo4j-cypher/language-support';
+import { mapCypherToSemanticTokenIndex } from '@neo4j-cypher/language-support';
 import {
   SemanticTokensBuilder,
   SemanticTokensParams,
   TextDocument,
   TextDocuments,
 } from 'vscode-languageserver';
+import { languageService } from './server';
 
-export function applySyntaxColouringForDocument(
+export function highlightSyntaxForDocument(
   documents: TextDocuments<TextDocument>,
 ) {
   return (params: SemanticTokensParams) => {
     const textDocument = documents.get(params.textDocument.uri);
     if (textDocument === undefined) return { data: [] };
 
-    const tokens = applySyntaxColouring(textDocument.getText());
+    const tokens = languageService.highlightSyntax(textDocument.getText());
 
     const builder = new SemanticTokensBuilder();