Merge remote-tracking branch 'origin' into database-procedures-warning

neo4j · Sep 18, 2024 · 30ddb3f · 30ddb3f
2 parents 023270b + 752ddf6
commit 30ddb3f
Show file tree

Hide file tree

Showing 19 changed files with 468 additions and 1,431 deletions.
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -32,6 +32,7 @@
     "purple-buckets-applaud",
     "purple-suns-applaud",
     "quick-berries-report",
+    "selfish-wombats-pay",
     "silver-students-wait",
     "stale-donkeys-grow",
     "stale-peas-warn",

diff --git a/.changeset/selfish-wombats-pay.md b/.changeset/selfish-wombats-pay.md
@@ -0,0 +1,5 @@
+---
+'@neo4j-cypher/language-support': patch
+---
+
+Fixes bug using non language keywords (EXPLAIN, PROFILE, etc) as symbolic names
diff --git a/.github/workflows/publish-npm-packages.yaml b/.github/workflows/publish-npm-packages.yaml
@@ -28,7 +28,7 @@ jobs:
 
       - name: Create Release Pull Request or Publish to npm
         id: changesets
-        uses: changesets/action@50750fa876cc1e54c7cb972db5e2f7271fc53d99 # v1.4.8
+        uses: changesets/action@3de3850952bec538fde60aac71731376e57b9b57 # v1.4.8
         with:
           publish: npm run release
         env:

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/language-server/CHANGELOG.md b/packages/language-server/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @neo4j-cypher/language-server
 
+## 2.0.0-next.9
+
+### Patch Changes
+
+- Updated dependencies [05663bd]
+  - @neo4j-cypher/language-support@2.0.0-next.8
+
 ## 2.0.0-next.8
 
 ### Patch Changes

diff --git a/packages/language-server/package.json b/packages/language-server/package.json
@@ -16,7 +16,7 @@
     "cypher",
     "language server"
   ],
-  "version": "2.0.0-next.8",
+  "version": "2.0.0-next.9",
   "main": "./dist/server.js",
   "types": "src/server.ts",
   "repository": {
@@ -34,7 +34,7 @@
     "cypher-language-server": "./dist/cypher-language-server"
   },
   "dependencies": {
-    "@neo4j-cypher/language-support": "2.0.0-next.7",
+    "@neo4j-cypher/language-support": "2.0.0-next.8",
     "lodash.debounce": "^4.0.8",
     "neo4j-driver": "^5.3.0",
     "vscode-languageserver": "^8.1.0",

diff --git a/packages/language-support/CHANGELOG.md b/packages/language-support/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @neo4j-cypher/language-support
 
+## 2.0.0-next.8
+
+### Patch Changes
+
+- 05663bd: Fixes bug using non language keywords (EXPLAIN, PROFILE, etc) as symbolic names
+
 ## 2.0.0-next.7
 
 ### Patch Changes

diff --git a/packages/language-support/package.json b/packages/language-support/package.json
@@ -18,7 +18,7 @@
     "linting",
     "highlighting"
   ],
-  "version": "2.0.0-next.7",
+  "version": "2.0.0-next.8",
   "main": "./dist/cjs/index.cjs",
   "module": "./dist/esm/index.mjs",
   "types": "./dist/types/index.d.js",

diff --git a/packages/language-support/src/antlr-grammar/CypherCmdParser.g4 b/packages/language-support/src/antlr-grammar/CypherCmdParser.g4
@@ -26,3 +26,5 @@ useCmd: useCompletionRule symbolicAliasName?;
 listCompletionRule: LIST; 
 
 useCompletionRule: USE;
+
+externalKeywords: preparserOption | HISTORY | CLEAR | PARAM;
diff --git a/packages/language-support/src/antlr-grammar/CypherParser.g4 b/packages/language-support/src/antlr-grammar/CypherParser.g4
@@ -1769,6 +1769,12 @@ symbolicLabelNameString
    | unescapedLabelSymbolicNameString
    ;
 
+// Do not remove this, it is needed for composing the grammar 
+// with other ones (e.g. language support ones)
+externalKeywords
+   : IDENTIFIER
+   ;
+
 unescapedLabelSymbolicNameString
    : IDENTIFIER
    | ACCESS
@@ -2025,6 +2031,7 @@ unescapedLabelSymbolicNameString
    | YIELD
    | ZONE
    | ZONED
+   | externalKeywords
    ;
 
 endOfFile

diff --git a/packages/language-support/src/tests/syntaxValidation/syntacticValidation.test.ts b/packages/language-support/src/tests/syntaxValidation/syntacticValidation.test.ts
@@ -976,4 +976,19 @@ describe('Syntactic validation spec', () => {
       },
     ]);
   });
+
+  test.each([
+    `MATCH (n:Test1) RETURN n.profile`,
+    `CREATE (n:Test1 {explain: 'Explain'});`,
+    `RETURN { clear: 'Clear', params: 'params', history: 'history'}`,
+  ])(
+    'Syntax validation should not fail if cmd keywords are used in map properties %s',
+    (query) => {
+      expect(
+        getDiagnosticsForQuery({
+          query,
+        }),
+      ).toEqual([]);
+    },
+  );
 });
diff --git a/packages/react-codemirror-playground/CHANGELOG.md b/packages/react-codemirror-playground/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @neo4j-cypher/react-codemirror-playground
 
+## 2.0.0-next.11
+
+### Patch Changes
+
+- Updated dependencies [05663bd]
+  - @neo4j-cypher/language-support@2.0.0-next.8
+  - @neo4j-cypher/react-codemirror@2.0.0-next.11
+
 ## 2.0.0-next.10
 
 ### Patch Changes

diff --git a/packages/react-codemirror-playground/package.json b/packages/react-codemirror-playground/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@neo4j-cypher/react-codemirror-playground",
   "private": true,
-  "version": "2.0.0-next.10",
+  "version": "2.0.0-next.11",
   "type": "module",
   "scripts": {
     "dev": "vite --open",
@@ -21,8 +21,8 @@
     "node": ">=18.18.2"
   },
   "dependencies": {
-    "@neo4j-cypher/language-support": "2.0.0-next.7",
-    "@neo4j-cypher/react-codemirror": "2.0.0-next.10",
+    "@neo4j-cypher/language-support": "2.0.0-next.8",
+    "@neo4j-cypher/react-codemirror": "2.0.0-next.11",
     "@codemirror/autocomplete": "^6.5.1",
     "@codemirror/commands": "^6.2.2",
     "@codemirror/language": "^6.6.0",

diff --git a/packages/react-codemirror/CHANGELOG.md b/packages/react-codemirror/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @neo4j-cypher/react-codemirror
 
+## 2.0.0-next.11
+
+### Patch Changes
+
+- Updated dependencies [05663bd]
+  - @neo4j-cypher/language-support@2.0.0-next.8
+
 ## 2.0.0-next.10
 
 ### Patch Changes

diff --git a/packages/react-codemirror/package.json b/packages/react-codemirror/package.json
@@ -17,7 +17,7 @@
     "codemirror",
     "codemirror 6"
   ],
-  "version": "2.0.0-next.10",
+  "version": "2.0.0-next.11",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",
@@ -51,7 +51,7 @@
     "@codemirror/view": "^6.29.1",
     "@lezer/common": "^1.0.2",
     "@lezer/highlight": "^1.1.3",
-    "@neo4j-cypher/language-support": "2.0.0-next.7",
+    "@neo4j-cypher/language-support": "2.0.0-next.8",
     "@types/prismjs": "^1.26.3",
     "@types/workerpool": "^6.4.7",
     "ayu": "^8.0.1",

diff --git a/packages/schema-poller/CHANGELOG.md b/packages/schema-poller/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @neo4j-cypher/schema-poller
 
+## 2.0.0-next.8
+
+### Patch Changes
+
+- Updated dependencies [05663bd]
+  - @neo4j-cypher/language-support@2.0.0-next.8
+
 ## 2.0.0-next.7
 
 ### Patch Changes

diff --git a/packages/schema-poller/package.json b/packages/schema-poller/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "author": "Neo4j Inc.",
   "license": "Apache-2.0",
-  "version": "2.0.0-next.7",
+  "version": "2.0.0-next.8",
   "main": "./dist/cjs/src/index.js",
   "module": "./dist/esm/src/index.js",
   "exports": {
@@ -26,7 +26,7 @@
     "node": ">=18.18.2"
   },
   "dependencies": {
-    "@neo4j-cypher/language-support": "2.0.0-next.7",
+    "@neo4j-cypher/language-support": "2.0.0-next.8",
     "ajv": "^8.12.0",
     "neo4j-driver": "^5.12.0"
   },

diff --git a/packages/vscode-extension/package.json b/packages/vscode-extension/package.json
@@ -294,7 +294,7 @@
     "test:webviews": "wdio run ./dist/tests/runWebviewTests.js"
   },
   "dependencies": {
-    "@neo4j-cypher/language-server": "2.0.0-next.8",
+    "@neo4j-cypher/language-server": "2.0.0-next.9",
     "@neo4j-ndl/base": "^2.12.3",
     "@neo4j-ndl/react": "^2.16.5",
     "neo4j-driver": "^5.12.0",

diff --git a/release-canary.js b/release-canary.js
@@ -77,6 +77,7 @@ function buildProject() {
 
 const langSupport = 'packages/language-support';
 const reactCodemirror = 'packages/react-codemirror';
+const reactCodemirrorPlayground = 'packages/react-codemirror-playground';
 const langSupportVersion = getCanaryVersion(langSupport);
 const reactCodemirrorVersion = getCanaryVersion(reactCodemirror);
 
@@ -97,6 +98,11 @@ replaceDependency(
   '@neo4j-cypher/language-support',
   langSupportVersion,
 );
+replaceDependency(
+  reactCodemirrorPlayground,
+  '@neo4j-cypher/react-codemirror',
+  reactCodemirrorVersion,
+);
 updateVersion(reactCodemirror, reactCodemirrorVersion);
 // We need to rebuild everything with the newly generated versions
 buildProject();