Merge branch 'master' into release

Author: MaxKless

.env

@@ -0,0 +1,2 @@
+NX_ISOLATE_PLUGINS=true
+NX_NATIVE_COMMAND_RUNNER=false

.eslintrc.json

@@ -52,13 +52,18 @@
             "argsIgnorePattern": "^_$"
           }
         ],
-        "@typescript-eslint/no-explicit-any": "off"
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
       }
     },
     {
       "files": ["*.js", "*.jsx"],
       "extends": ["plugin:@nx/javascript"],
-      "rules": {}
+      "rules": {
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
+      }
     },
     {
       "files": ["*.html"],

.github/workflows/ci_checks.yml

@@ -43,7 +43,9 @@ jobs:
         env:
           NX_CLOUD_DISTRIBUTED_EXECUTION: false
       - run: npx nx affected --targets=lint,test,build --configuration=ci --exclude=nx-console --parallel=1
-      - run: npx nx affected --targets=e2e,e2e-local --configuration=ci --exclude=nx-console --parallel=1
+      - run: npx nx affected --targets=e2e-ci --exclude=nx-console --parallel=1
+        timeout-minutes: 45
+
   main-windows:
     name: Main Windows
     runs-on: windows-latest
@@ -81,7 +83,7 @@ jobs:
           java-version: 17
           cache: gradle
       # there's no need to check formatting & linting again on windows, sometimes there's a timing issue with intellij:build so run it up front
-      - run: npx nx run intellij:build --info
+      - run: npx nx run intellij:build --info --verbose
       - run: npx nx affected --targets="build,test" --configuration=ci --exclude=nx-console --parallel=1
-      - run: npx nx affected --targets="e2e,e2e-local" --configuration=ci --exclude=nx-console --parallel=1
-        timeout-minutes: 60
+      - run: npx nx affected --targets="e2e-ci" --exclude=nx-console --parallel=1
+        timeout-minutes: 45

.gitignore

@@ -53,7 +53,7 @@ testem.log
 Thumbs.db
 
 #Environment
-.env
+.env.local
 
 # Intellij
 .gradle
@@ -68,4 +68,6 @@ apps/vscode-e2e/.screenshots
 .angular
 
 .nx/cache
-**/cypress/downloads
+.nx/workspace-data
+**/cypress/downloads
+migrations.json

.prettierignore

@@ -2,4 +2,5 @@ CHANGELOG.md
 apps/intellij/*
 !apps/intellij/project.json
 
-/.nx/cache
+/.nx/cache
+/.nx/workspace-data

apps/intellij/build.gradle.kts

@@ -103,7 +103,6 @@ tasks {
     runInspections { mount("${rootDir}/gradle.properties", "/data/project/gradle.properties") }
 
     prepareSandbox() {
-        dependsOn("buildNxls")
         from(nxlsRoot) {
             include("**/*.js")
             include("**/package.json")
@@ -115,7 +114,14 @@ tasks {
             exec {
                 logger.warn("rootproject ${rootProject.name}")
                 logger.warn("Working dir: $workingDir")
-                commandLine = buildCommands() + "npx nx run intellij:install-nxls-deps"
+                logger.warn("Working dir: $destinationDir")
+
+                workingDir =
+                    File(
+                        destinationDir,
+                        rootProject.name + "/nxls",
+                    )
+                commandLine = buildCommands() + "npm install --force"
             }
         }
     }
@@ -203,37 +209,13 @@ tasks {
     }
 }
 
-tasks.register<Exec>("buildNxls") {
-    commandLine =
-        if (System.getenv("IDEA_DEBUG") == "true") {
-            buildCommands() + "npx nx run nxls:build:debug"
-        } else {
-            buildCommands() + "npx nx run nxls:build"
-        }
-    workingDir = rootDir
-}
-
-tasks.register<Exec>("buildGenerateUi") {
-    commandLine = buildCommands() + "npx nx run generate-ui:build:production-intellij"
-    workingDir = rootDir
-}
-
-tasks.register<Exec>("buildGenerateUiV2") {
-    commandLine = buildCommands() + "npx nx run generate-ui-v2:build"
-    workingDir = rootDir
-}
-
 tasks.register<Copy>("copyGenerateUiArtifacts") {
-    dependsOn("buildGenerateUi")
-
     from("${rootDir}/dist/apps/generate-ui")
     include("*.js", "*.css")
     into("${buildDir}/resources/main/generate_ui")
 }
 
 tasks.register<Copy>("copyGenerateUiV2Artifacts") {
-    dependsOn("buildGenerateUiV2")
-
     from("${rootDir}/dist/apps/generate-ui-v2")
     include("*.js", "*.css")
     into("${buildDir}/resources/main/generate_ui_v2")

apps/intellij/project.json

@@ -3,24 +3,20 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "targets": {
-    "runIde": {
-      "executor": "nx:run-commands",
-      "options": {
-        "command": "node ./apps/intellij/run-gradle.js :apps:intellij:runIde"
-      }
-    },
     "build": {
-      "inputs": ["kotlin"],
-      "outputs": ["{workspaceRoot}/dist/apps/intellij/distributions"],
-      "executor": "nx:run-commands",
-      "options": {
-        "command": "node ./apps/intellij/run-gradle.js :apps:intellij:buildPlugin"
-      },
+      "command": "yarn nx run intellij:buildPlugin",
       "configurations": {
         "production-intellij": {}
       },
       "dependsOn": ["^build"]
     },
+    "runIde": {
+      "command": "yarn nx run intellij:runIde",
+      "dependsOn": ["^build"]
+    },
+    "test": {
+      "command": "yarn nx run intellij:check"
+    },
     "lint": {
       "executor": "nx:noop"
     },
@@ -31,12 +27,6 @@
         "command": "node ./apps/intellij/run-gradle.js :apps:intellij:runInspections"
       }
     },
-    "install-nxls-deps": {
-      "command": "node ./tools/scripts/install-nxls-deps-intellij.js",
-      "outputs": [
-        "{workspaceRoot}/dist/apps/intellij/idea-sandbox/plugins/nx-console/nxls"
-      ]
-    },
     "semantic-release": {
       "executor": "@theunderscorer/nx-semantic-release:semantic-release",
       "options": {
@@ -52,5 +42,5 @@
     }
   },
   "tags": ["type:intellij"],
-  "implicitDependencies": ["generate-ui", "nxls"]
+  "implicitDependencies": ["generate-ui", "nxls", "generate-ui-v2"]
 }

apps/intellij/run-gradle.js

@@ -3,12 +3,13 @@ package dev.nx.console
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.ProjectActivity
+import dev.nx.console.ide.ProjectGraphErrorProblemProvider
 import dev.nx.console.nxls.NxlsService
 import dev.nx.console.settings.NxConsoleSettingsProvider
 import dev.nx.console.telemetry.TelemetryService
 import dev.nx.console.utils.Notifier
-import dev.nx.console.utils.NxProjectJsonToProjectMap
 import dev.nx.console.utils.nxBasePath
+import dev.nx.console.utils.sync_services.NxProjectJsonToProjectMap
 import java.io.File
 
 private val logger = logger<ProjectPostStartup>()
@@ -17,13 +18,16 @@ class ProjectPostStartup : ProjectActivity {
     override suspend fun execute(project: Project) {
 
         var currentDir = File(project.nxBasePath)
-        val filesToScanFor = listOf("nx.json", "workspace.json", "angular.json", "lerna.json")
+        val filesToScanFor = listOf("nx.json", "workspace.json", "lerna.json")
 
         while (true) {
             if (filesToScanFor.any { currentDir.resolve(it).exists() }) {
                 val service = NxlsService.getInstance(project)
                 service.start()
-                service.runAfterStarted { NxProjectJsonToProjectMap.getInstance(project).init() }
+                service.runAfterStarted {
+                    NxProjectJsonToProjectMap.getInstance(project).init()
+                    ProjectGraphErrorProblemProvider.getInstance(project).init()
+                }
                 break
             }
             if (currentDir.parentFile == null) {

apps/intellij/src/main/kotlin/dev/nx/console/ProjectPostStartup.kt

@@ -33,7 +33,7 @@ class NxGeneratorListCellRenderer(
             SimpleTextAttributes.REGULAR_ATTRIBUTES,
             true
         )
-        if (value.data.description != null) {
+        if (value.data.description != null && value.name.length < 80) {
             append(
                 " " +
                     StringUtil.shortenTextWithEllipsis(

apps/intellij/src/main/kotlin/dev/nx/console/generate/ui/NxGeneratorListCellRenderer.kt

@@ -287,9 +287,10 @@ abstract class NxGraphBrowserBase(protected val project: Project) : Disposable {
                 return true
             }
             "run-help" -> {
-                event.payload?.let { (projectName, _, _, _, _, helpCommand) ->
+                event.payload?.let { (projectName, _, _, _, _, helpCommand, helpCwd) ->
                     if (projectName != null && helpCommand != null) {
-                        NxHelpCommandService.getInstance(project).execute(projectName, helpCommand)
+                        NxHelpCommandService.getInstance(project)
+                            .execute(projectName, helpCommand, helpCwd)
                     }
                 }
                 return true
@@ -422,9 +423,7 @@ abstract class NxGraphBrowserBase(protected val project: Project) : Disposable {
                             if (response.error != null) {
                                 thisLogger()
                                     .debug("Error handling graph request: ${response.error}")
-                                setErrorsAndRefresh(
-                                    arrayOf(NxError(response.error, null, null, null))
-                                )
+                                setErrorsAndRefresh(arrayOf(NxError(response.error)))
                                 return@launch
                             }
                             try {
@@ -467,6 +466,7 @@ data class NxGraphInteractionPayload(
     val taskId: String? = null,
     val targetConfigString: String? = null,
     val helpCommand: String? = null,
+    val helpCwd: String? = null,
 )
 
 @Serializable

apps/intellij/src/main/kotlin/dev/nx/console/graph/NxGraphBrowserBase.kt

@@ -20,13 +20,13 @@ class NxGraphFocusTaskGroupAction : DumbAwareAction() {
 
     override fun update(e: AnActionEvent) {
         useKeyMapShortcutSetOrDefault()
-        val targetGroup: NxSimpleNode.TargetGroup? =
-            e.getData(NxTreeNodeKey).let { it as? NxSimpleNode.TargetGroup }
+        val targetsList: NxSimpleNode.TargetsList? =
+            e.getData(NxTreeNodeKey).let { it as? NxSimpleNode.TargetsList }
 
-        if (targetGroup == null) {
+        if (targetsList == null) {
             e.presentation.isEnabledAndVisible = false
         } else {
-            e.presentation.text = "Nx Graph: Focus ${targetGroup.name} targets"
+            e.presentation.text = "Nx Graph: Focus ${targetsList.name} targets"
             e.presentation.icon = NxIcons.Action
         }
     }
@@ -36,12 +36,12 @@ class NxGraphFocusTaskGroupAction : DumbAwareAction() {
     override fun actionPerformed(e: AnActionEvent) {
         val project = e.project ?: return
         TelemetryService.getInstance(project).featureUsed("Nx Graph Focus Task Group")
-        val targetGroup: NxSimpleNode.TargetGroup =
-            e.getData(NxTreeNodeKey).let { it as? NxSimpleNode.TargetGroup } ?: return
+        val targetsList: NxSimpleNode.TargetsList =
+            e.getData(NxTreeNodeKey).let { it as? NxSimpleNode.TargetsList } ?: return
 
         ProjectLevelCoroutineHolderService.getInstance(project).cs.launch {
             val nxGraphService = getNxGraphService(project) ?: return@launch
-            withContext(Dispatchers.EDT) { nxGraphService.focusTaskGroup(targetGroup.name) }
+            withContext(Dispatchers.EDT) { nxGraphService.focusTaskGroup(targetsList.name) }
         }
     }