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

package/dist/server.js

@@ -46,11 +46,11 @@ class SymbolFetcher {
         this.processing = true;
         while (this.nextJob) {
             try {
-                const proxyWorker = (await this.symbolTablePool.proxy());
                 const query = this.nextJob.query;
                 const dbSchema = this.nextJob.schema;
                 const docUri = this.nextJob.uri;
                 this.nextJob = undefined;
+                const proxyWorker = (await this.symbolTablePool.proxy());
                 const fixedDbSchema = (0, lint_worker_1.convertDbSchema)(dbSchema, this.linterVersion);
                 const result = await proxyWorker.lintCypherQuery(query, fixedDbSchema);
                 if (
@@ -169,9 +169,7 @@ connection.onNotification('connectionUpdated', (connectionSettings) => {
     neo4jSchemaPoller.events.once('schemaFetched', relintAllDocuments);
 });
 connection.onNotification('fetchSymbolTable', (params) => {
-    neo4jSchemaPoller.events.once('schemaFetched', 
-    // oxlint-disable-next-line typescript-eslint/no-meaningless-void-operator
-    void symbolFetcher.queueSymbolJob(params.query, params.uri, params.schema));
+    neo4jSchemaPoller.events.once('schemaFetched', () => symbolFetcher.queueSymbolJob(params.query, params.uri, params.schema));
 });
 connection.onNotification('updateParameters', (parameters) => {
     neo4jSchemaPoller.setParameters(parameters);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neo4j-cypher/language-server",
-  "version": "2.0.0-next.32",
+  "version": "2.0.0-next.34",
   "description": "Cypher Language Server",
   "keywords": [
     "cypher",
@@ -30,15 +30,15 @@
   "main": "./dist/server.js",
   "types": "src/server.ts",
   "dependencies": {
-    "axios": "^1.9.0",
+    "axios": "^1.15.2",
     "lodash.debounce": "^4.0.8",
     "neo4j-driver": "6.0.1",
     "vscode-languageserver": "^8.1.0",
     "vscode-languageserver-textdocument": "^1.0.8",
     "workerpool": "^9.3.3",
-    "@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"
+    "@neo4j-cypher/lint-worker": "1.10.1-next.10",
+    "@neo4j-cypher/query-tools": "2.0.0-next.33",
+    "@neo4j-cypher/language-support": "2.0.0-next.33"
   },
   "devDependencies": {
     "@types/lodash.debounce": "^4.0.9",

package/src/linting.ts

@@ -1,6 +1,8 @@
 import {
   clampUnsafePositions,
+  isNotParamError,
   SymbolTable,
+  SyntaxDiagnostic,
 } from '@neo4j-cypher/language-support';
 import { Neo4jSchemaPoller } from '@neo4j-cypher/query-tools';
 import debounce from 'lodash.debounce';
@@ -63,12 +65,6 @@ async function rawLintDocument(
     });
     const result = await lastSemanticJob;
 
-    //marks the entire text if any position is negative
-    const positionSafeResult = clampUnsafePositions(
-      result.diagnostics,
-      document,
-    );
-
     // Pass the computed symbol tables to the parser
     if (result.symbolTables) {
       languageService.setSymbolsInfo(
@@ -80,7 +76,13 @@ async function rawLintDocument(
       );
     }
 
-    sendDiagnostics(positionSafeResult);
+    sendDiagnostics(
+      filterLintResult(
+        result.diagnostics,
+        dbSchema?.databaseNames?.length ? false : true,
+        document,
+      ),
+    );
   } catch (err) {
     if (!(err instanceof workerpool.Promise.CancellationError)) {
       console.error(err);
@@ -88,6 +90,16 @@ async function rawLintDocument(
   }
 }
 
+function filterLintResult(
+  diagnostics: SyntaxDiagnostic[],
+  dontWarnOnParams: boolean,
+  document: TextDocument,
+) {
+  return dontWarnOnParams
+    ? clampUnsafePositions(diagnostics.filter(isNotParamError), document)
+    : clampUnsafePositions(diagnostics, document);
+}
+
 export const lintDocument: typeof rawLintDocument = debounce(
   rawLintDocument,
   600,

package/src/server.ts

@@ -41,11 +41,13 @@ export const languageService = new CypherLanguageService({
 
 class SymbolFetcher {
   private processing = false;
-  private nextJob: {
-    query: string;
-    uri: string;
-    schema: DbSchema;
-  };
+  private nextJob:
+    | {
+        query: string;
+        uri: string;
+        schema: DbSchema;
+      }
+    | undefined;
   private symbolTablePool = workerpool.pool(defaultWorkerPath, {
     maxWorkers: 1,
     workerTerminateTimeout: 0,
@@ -74,12 +76,12 @@ class SymbolFetcher {
     this.processing = true;
     while (this.nextJob) {
       try {
-        const proxyWorker =
-          (await this.symbolTablePool.proxy()) as unknown as LintWorker;
         const query = this.nextJob.query;
         const dbSchema = this.nextJob.schema;
         const docUri = this.nextJob.uri;
         this.nextJob = undefined;
+        const proxyWorker =
+          (await this.symbolTablePool.proxy()) as unknown as LintWorker;
         const fixedDbSchema = convertDbSchema(dbSchema, this.linterVersion);
 
         const result = await proxyWorker.lintCypherQuery(query, fixedDbSchema);
@@ -244,14 +246,8 @@ connection.onNotification(
     version: number;
     schema: DbSchema;
   }) => {
-    neo4jSchemaPoller.events.once(
-      'schemaFetched',
-      // oxlint-disable-next-line typescript-eslint/no-meaningless-void-operator
-      void symbolFetcher.queueSymbolJob(
-        params.query,
-        params.uri,
-        params.schema,
-      ),
+    neo4jSchemaPoller.events.once('schemaFetched', () =>
+      symbolFetcher.queueSymbolJob(params.query, params.uri, params.schema),
     );
   },
 );