Merge branch 'redhat-developer:main' into lsp_completion_sorting

redhat-developer · Dec 16, 2024 · 8f2a3df · 8f2a3df
2 parents c115402 + 926caf2
commit 8f2a3df
Show file tree

Hide file tree

Showing 7 changed files with 2,500 additions and 87 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ pluginName=LSP4IJ
 pluginRepositoryUrl=https://github.com/redhat-developer/lsp4ij
 # SemVer format -> https://semver.org
 # NO SPACES AROUND THE EQUALS SIGN!!
-pluginVersion=0.9.0-SNAPSHOT
+pluginVersion=0.9.1-SNAPSHOT
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild=232
 #pluginUntilBuild=233.*

diff --git a/src/main/java/com/redhat/devtools/lsp4ij/internal/ClientCapabilitiesFactory.java b/src/main/java/com/redhat/devtools/lsp4ij/internal/ClientCapabilitiesFactory.java
@@ -91,6 +91,9 @@ private static GeneralClientCapabilities getGeneralClientCapabilities() {
         // See https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#didChangeConfigurationClientCapabilities
         workspaceClientCapabilities.setDidChangeConfiguration(new DidChangeConfigurationCapabilities(Boolean.TRUE));
 
+        // Refresh support for CodeLens
+        workspaceClientCapabilities.setCodeLens(new CodeLensWorkspaceCapabilities(Boolean.TRUE));
+
         // Refresh support for InlayHint
         workspaceClientCapabilities.setInlayHint(new InlayHintWorkspaceCapabilities(Boolean.TRUE));
 

diff --git a/src/main/java/com/redhat/devtools/lsp4ij/settings/ui/LanguageServerPanel.java b/src/main/java/com/redhat/devtools/lsp4ij/settings/ui/LanguageServerPanel.java
@@ -356,6 +356,8 @@ public ComboBox<ErrorReportingKind> getErrorReportingKindCombo() {
 
     @Override
     public void dispose() {
-        getConfiguration().resetJsonSchema();
+        if (configurationWidget != null) {
+            configurationWidget.resetJsonSchema();
+        }
     }
 }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -5,6 +5,18 @@
     <vendor email="developers@redhat.com" url="https://github.com/redhat-developer/lsp4ij/issues">Red-Hat</vendor>
 
     <change-notes><![CDATA[
+    <h3>0.9.0</h3>
+    <ul>
+      <li>Support for <a href="https://github.com/redhat-developer/lsp4ij/blob/main/docs/LSPSupport.md#selection-range">Selection Range</a></li>
+      <li>Use standard menu Implementation(s) (Ctrl+Alt+B) to execute <a href="https://github.com/redhat-developer/lsp4ij/blob/main/docs/LSPSupport.md#implementation">Implementation</a></li>
+      <li>Use standard menu Type Declaration (Ctrl+Shift+B) to execute <a href="https://github.com/redhat-developer/lsp4ij/blob/main/docs/LSPSupport.md#type-definition">Type definition</a></li>
+      <li>LSP code folding improvements for braced blocks and code block provider implementation based on that same information</li>
+      <li>Show workspace symbols with Class, Struct, Type kind in the standard Class tab (Ctrl+N)</li>
+      <li>Provide completion, validation, etc for configuring user-defined language servers based on JSON Schema</li>
+      <li>Fixing bugs</li>
+    </ul>
+    Learn more in the <a href="https://github.com/redhat-developer/lsp4ij/milestone/10?closed=1">changelog</a>.
+L
     <h3>0.8.1</h3>
     <ul>
       <li>Remove using internal API ProjectIndexingActivityHistoryListener</li>

diff --git a/src/main/resources/templates/rust-analyzer/initializationOptions.json b/src/main/resources/templates/rust-analyzer/initializationOptions.json
@@ -1,84 +1 @@
-{
-  "imports": {
-    "granularity": {
-      "group": "module"
-    },
-    "prefix": "self"
-  },
-  "cargo": {
-    "buildScripts": {
-      "enable": true
-    }
-  },
-  "completion": {
-    "autoimport": {
-      "enable": true
-    },
-    "autoself": {
-      "enable": true
-    },
-    "callable": {
-      "snippets": "fill_arguments"
-    },
-    "fullFunctionSignatures": {
-      "enable": false
-    },
-    "limit": null,
-    "postfix": {
-      "enable": true
-    },
-    "privateEditable": {
-      "enable": false
-    },
-    "snippets": {
-      "custom": {
-        "Arc::new": {
-          "postfix": "arc",
-          "body": "Arc::new(${receiver})",
-          "requires": "std::sync::Arc",
-          "description": "Put the expression into an `Arc`",
-          "scope": "expr"
-        },
-        "Rc::new": {
-          "postfix": "rc",
-          "body": "Rc::new(${receiver})",
-          "requires": "std::rc::Rc",
-          "description": "Put the expression into an `Rc`",
-          "scope": "expr"
-        },
-        "Box::pin": {
-          "postfix": "pinbox",
-          "body": "Box::pin(${receiver})",
-          "requires": "std::boxed::Box",
-          "description": "Put the expression into a pinned `Box`",
-          "scope": "expr"
-        },
-        "Ok": {
-          "postfix": "ok",
-          "body": "Ok(${receiver})",
-          "description": "Wrap the expression in a `Result::Ok`",
-          "scope": "expr"
-        },
-        "Err": {
-          "postfix": "err",
-          "body": "Err(${receiver})",
-          "description": "Wrap the expression in a `Result::Err`",
-          "scope": "expr"
-        },
-        "Some": {
-          "postfix": "some",
-          "body": "Some(${receiver})",
-          "description": "Wrap the expression in an `Option::Some`",
-          "scope": "expr"
-        }
-      }
-    }
-  },
-  "termSearch": {
-    "enable": false,
-    "fuel": 200
-  },
-  "procMacro": {
-    "enable": true
-  }
-}
+{}