Integrate IntelliJ plugin into pnpm 🚀

.github/workflows/archive-vscode-artifacts.yaml

@@ -19,6 +19,11 @@ jobs:
       - name: Setup antlr4
         uses: ./.github/actions/setup-antlr4
 
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
       - name: Install dependencies with frozen lock file and generate parser
         run: npm ci
 

.github/workflows/benchmark.yaml

@@ -16,6 +16,11 @@ jobs:
       - name: Setup antlr4
         uses: ./.github/actions/setup-antlr4
 
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
       - name: Install dependencies with frozen lock file and generate parser
         run: npm ci
 

.github/workflows/ci.yaml

@@ -20,6 +20,11 @@ jobs:
       - name: Setup antlr4
         uses: ./.github/actions/setup-antlr4
 
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
       - name: Install dependencies with frozen lock file and generate parser
         run: npm ci
 
@@ -45,6 +50,11 @@ jobs:
       - name: Setup antlr4
         uses: ./.github/actions/setup-antlr4
 
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
       - name: Install dependencies with frozen lock file and generate parser
         run: npm ci
 
@@ -63,6 +73,11 @@ jobs:
       - name: Setup antlr4
         uses: ./.github/actions/setup-antlr4
 
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
       - name: Install dependencies
         run: npm ci
 

.github/workflows/deploy-demo.yml

@@ -39,6 +39,11 @@ jobs:
       - name: Setup antlr4
         uses: ./.github/actions/setup-antlr4
 
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
       - name: Install dependencies with frozen lock file and generate parser
         run: npm ci
 

.github/workflows/publish-vscode-extension.yaml

@@ -27,6 +27,11 @@ jobs:
       - name: Setup antlr4
         uses: ./.github/actions/setup-antlr4
 
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
       - name: Install dependencies with frozen lock file
         run: npm ci
 

.gitignore

@@ -17,6 +17,49 @@ generated
 *.tsbuildinfo
 *.npmrc
 benchmarks.txt
-.idea/
 vite.config.ts.timestamp*
-.wdio-vscode-service
+.wdio-vscode-service.gradle
+.run
+
+## Gradle ##
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+.intellijPlatform
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
+
+### Javascript files
+*.js

README.md

@@ -17,6 +17,7 @@ The project comprises several packages:
 - [language-support](./packages/language-support/README.md) - The core library implementing the language support features.
 - [language-server](./packages/language-server/README.md) - The language server wrapper for the `language-support` package.
 - [vscode-extension](./packages/vscode-extension/README.md) - The Neo4j VS Code extension which bundles the `language-server`
+- [intellij-extension](./packages/intellij-extension/README.md) - The Neo4j Intellij plugin which bundles the `language-server`
 - [react-codemirror](./packages/react-codemirror/README.md) - A set of [codemirror6](https://codemirror.net/) cypher language support plugins and a react wrapper.
 - [react-codemirror-playground](./packages/react-codemirror-playground/README.md) - A playground for the codemirror integration.
 - [schema-poller](./packages/schema-poller/README.md) - An internal package we use to manage the Neo4j connection and keep the schema (procedure names, labels, database names, etc.) up to date in the language server.

package.json

@@ -16,6 +16,7 @@
     "prepare": "husky install",
     "build": "turbo run build",
     "build-vscode": "turbo run neo4j-for-vscode#build:dev",
+    "build-intellij": "turbo run neo4j-for-intellij#build",
     "release": "turbo run build && npx changeset publish",
     "clean": "turbo run clean",
     "watch": "turbowatch ./turbowatch.ts",

editor-plugin/intellij/.gitignore → packages/intellij-extension/.gitignore

@@ -1,4 +1,5 @@
 .gradle
+.run
 build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/

packages/intellij-extension/README.md

@@ -0,0 +1,37 @@
+# Neo4j Cypher LSP support for IntelliJ
+
+## Build and run
+
+Run through the [prerequisites](../../CONTRIBUTING.md#building-the-project).
+
+You can build the plugin from the project root using [`turbo`](https://turbo.build):
+
+```
+$ npx turbo neo4j-for-intellij#build
+```
+
+`gradle` is also an option (and can be used from within IntelliJ):
+
+```
+$ cd packages/intellij-extension && ./gradlew buildPlugin
+```
+
+## Develop and test
+
+If you want to test the plugin during a development workflow, you can spin up a temporary copy
+of IntelliJ that runs with a freshly built version enabled by default:
+
+```
+$ npx turbo neo4j-for-intellij#runIde
+```
+
+...this target also exists in `gradle`:
+
+```
+$ cd packages/intellij-extension && ./gradlew runIde
+```
+
+## Installing the plugin manually
+
+From IntelliJ, open Settings > Plugins > (cog icon) > Install Plugin from disk, and browse to the jar file
+located in `packages/intellij-extension/build/distributions`.

editor-plugin/intellij/build.gradle.kts → packages/intellij-extension/build.gradle.kts

@@ -35,21 +35,48 @@ tasks {
         }
     }
 
-    prepareSandbox {
-        doFirst {
+    task("bundleServer") {
+        val outputFile = file("../language-server/dist/cypher-language-server.js")
+        val targetDir = file(".")
+
+        inputs.file(outputFile)
+        outputs.file(targetDir.resolve("cypher-language-server.js"))
+
+        doLast {
             exec {
-                commandLine("bash", "-c", "cd ../.. && npm run build && cp packages/language-server/dist/cypher-language-server.js ./editor-plugin/intellij")
+                workingDir = file("../language-server")
+                commandLine = listOf("bash", "-c", "npm run bundle")
+            }
+
+            copy {
+                from(outputFile)
+                into(targetDir)
             }
         }
+    }
+
+    prepareSandbox {
+        dependsOn("bundleServer")
+
         from(".") {
             include("*.js")
-            into("cypher-lsp-support")
+            into("neo4j-for-intellij")
         }
     }
 
-    patchPluginXml {
-        sinceBuild.set("242")
-        untilBuild.set("242.*")
+    buildPlugin {
+        dependsOn(prepareSandbox)
+    }
+
+    runIde {
+        dependsOn(buildPlugin, prepareSandbox)
+
+        debugOptions {
+           enabled = false
+           port = 8000
+           server = true
+           suspend = true
+       }
     }
 
     signPlugin {

packages/intellij-extension/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "neo4j-for-intellij",
+  "version": "1.0.0",
+  "description": "Highlighting, completions and more for Neo4j Cypher in IntelliJ",
+  "publisher": "neo4j-extensions",
+  "author": "Neo4j Inc.",
+  "license": "Apache-2.0",
+  "preview": true,
+  "scripts": {
+    "build": "./gradlew -q buildPlugin",
+    "clean": "./gradlew -q clean",
+    "runIde": "./gradlew -q runIde"
+  }
+}

editor-plugin/intellij/settings.gradle.kts → packages/intellij-extension/settings.gradle.kts

@@ -5,4 +5,4 @@ pluginManagement {
     }
 }
 
-rootProject.name = "cypher-lsp-support"
+rootProject.name = "neo4j-for-intellij"

editor-plugin/intellij/src/main/java/org/neo4j/intellij/lsp/language/CypherLanguage.java → packages/intellij-extension/src/main/java/org/neo4j/intellij/lsp/language/CypherLanguage.java

@@ -1,11 +1,17 @@
 package org.neo4j.intellij.lsp.language;
 
 import com.intellij.lang.Language;
+import org.jetbrains.annotations.NotNull;
 
 public class CypherLanguage extends Language {
-
     public static final CypherLanguage INSTANCE = new CypherLanguage();
+
     private CypherLanguage() {
         super("Cypher");
     }
+
+    @Override
+    public @NotNull String getDisplayName() {
+        return "Cypher";
+    }
 }

editor-plugin/intellij/src/main/resources/META-INF/plugin.xml → packages/intellij-extension/src/main/resources/META-INF/plugin.xml

@@ -1,7 +1,10 @@
 <idea-plugin>
-    <id>org.neo4j.intellij.lsp.cypher-lsp-support</id>
+    <id>org.neo4j.intellij.lsp.neo4j-for-intellij</id>
 
-    <name>Cypher Lsp Support</name>
+    <!-- see https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html -->
+    <idea-version since-build="242.23339"/>
+
+    <name>Neo4j for IntelliJ</name>
 
     <vendor url="https://www.neo4j.com">Neo4j Inc.</vendor>
 
@@ -17,11 +20,13 @@
     <extensions defaultExtensionNs="com.intellij">
         <platform.lsp.serverSupportProvider
                 implementation="org.neo4j.intellij.lsp.cypherlspsupport.CypherLspServerSupportProvider"/>
+
         <fileType
                 name="Cypher File"
+                language="Cypher"
                 implementationClass="org.neo4j.intellij.lsp.language.CypherFileType"
+                extensions="cypher"
                 fieldName="INSTANCE"
-                language="Cypher"
-                extensions="cypher"/>
+        />
     </extensions>
 </idea-plugin>

packages/intellij-extension/src/main/resources/fileTemplates/Cypher File.cypher.html

@@ -0,0 +1 @@
+<font face="verdana" size="-1">This file template is used whenever you create a new Cypher file.</font>