Fixes windows setup (#291)

--------- Co-authored-by: Nacho Cordon <[email protected]>
neo4j · Nov 14, 2024 · 36e421b · 36e421b
1 parent dd41bf6
commit 36e421b
Show file tree

Hide file tree

Showing 8 changed files with 103,032 additions and 12 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,4 +2,5 @@
 *.gif filter=lfs diff=lfs merge=lfs -text
 
 
-semanticAnalysis.js linguist-vendored
+semanticAnalysis.js linguist-vendored
+ndl.css linguist-vendored
diff --git a/packages/language-support/src/antlr-grammar/Cypher5Lexer.g4 b/packages/language-support/src/antlr-grammar/Cypher5Lexer.g4
@@ -1295,15 +1295,15 @@ IDENTIFIER
    ;
 
 ARROW_LINE
-   : [\-\u00AD‐‑‒–—―﹘﹣－]
+   : [\-\u00AD\u2010\u2011\u2012\u2013\u2014\u2015\ufe58\ufe63\uff0d]
    ;
 
 ARROW_LEFT_HEAD
-   : [⟨〈﹤＜]
+   : [\u27e8\u3008\ufe64\uff1c\u003c]
    ;
 
 ARROW_RIGHT_HEAD
-   : [⟩〉﹥＞]
+   : [\u27e9\u3009\ufe65\uff1e]
    ;
 
 fragment LETTER

diff --git a/packages/vscode-extension/.gitignore b/packages/vscode-extension/.gitignore
@@ -1,4 +1,3 @@
 tests/fixtures/.env.test
 webview_tests/fixtures/.env.test
-.wdio-vscode-service
-resources/styles/ndl.css
+.wdio-vscode-service
diff --git a/packages/vscode-extension/esbuild.js → ...ges/vscode-extension/esbuild-extension.js b/packages/vscode-extension/esbuild.js → ...ges/vscode-extension/esbuild-extension.js
diff --git a/packages/vscode-extension/package.json b/packages/vscode-extension/package.json
@@ -298,11 +298,11 @@
     "gen-textmate": "node ./genTextMate.js",
     "vscode:prepublish": "npm run build",
     "bundle-language-server": "cd ../language-server && npm run bundle && cp dist/cypher-language-server.js ../vscode-extension/dist/ && npm run bundle-worker && cp dist/lintWorker.js ../vscode-extension/dist/",
-    "bundle-extension": "node ./esbuild.js --production",
-    "bundle-ndl": "esbuild src/ndl.ts --outfile=resources/styles/ndl.js --bundle --loader:.woff2=dataurl && rm resources/styles/ndl.js",
-    "bundle-extension:dev": "node ./esbuild.js",
+    "bundle-extension": "node ./esbuild-extension.js --production",
+    "update-ndl-css": "esbuild src/ndl.ts --outfile=resources/styles/ndl.js --bundle --loader:.woff2=dataurl && rm resources/styles/ndl.js",
+    "bundle-extension:dev": "node ./esbuild-extension.js",
     "bundle-webview-controllers": "esbuild ./src/webviews/controllers/* --bundle --outdir=dist/webviews/ --platform=browser",
-    "build": "tsc -b && npm run gen-textmate && npm run bundle-extension && npm run bundle-language-server && npm run bundle-webview-controllers && npm run bundle-ndl",
+    "build": "tsc -b && npm run gen-textmate && npm run bundle-extension && npm run bundle-language-server && npm run bundle-webview-controllers",
     "build:dev": "tsc -b && npm run gen-textmate && npm run bundle-extension:dev && npm run bundle-language-server && npm run bundle-webview-controllers",
     "clean": "rm -rf dist",
     "test:e2e": "npm run build && npm run test:apiAndUnit && npm run test:webviews",

diff --git a/packages/vscode-extension/resources/styles/ndl.css b/packages/vscode-extension/resources/styles/ndl.css
diff --git a/vendor/antlr4-c3/package.json b/vendor/antlr4-c3/package.json
@@ -30,7 +30,7 @@
     "build-commonjs": "tsc --module commonjs --outDir dist/cjs",
     "prepublishOnly": "npm run generate && npm run test",
     "test": "vitest run",
-    "generate": "tests/generate.sh",
+    "generate": "cd tests && sh generate.sh",
     "eslint": "eslint .",
     "clean": "rm -rf dist"
   },

diff --git a/vendor/antlr4-c3/tests/generate.sh b/vendor/antlr4-c3/tests/generate.sh
@@ -1,4 +1,4 @@
-GRAMMAR_DIR=${PWD}/tests
+GRAMMAR_DIR=${PWD}
 
 antlr4 -Dlanguage=TypeScript \
   -no-listener -no-visitor \