Merge pull request #7082 from Achal1607/vscode-warnings-integrate

Integrate hints preferences option in the vscode extension
apache · Apr 16, 2024 · e6f0f68 · e6f0f68
2 parents 8c75f2d + 89d8dbb
commit e6f0f68
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/...lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java b/...lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
@@ -2093,7 +2093,7 @@ void updateJavaHintPreferences(JsonObject configuration) {
             String path = pathPrimitive.getAsString();
             Path p = Paths.get(path);
             FileObject preferencesFile = FileUtil.toFileObject(p);
-            if (preferencesFile != null && preferencesFile.isValid() && preferencesFile.canRead() && preferencesFile.getName().endsWith(".xml")) {
+            if (preferencesFile != null && preferencesFile.isValid() && preferencesFile.canRead() && preferencesFile.getExt().equals("xml")) {
                 this.hintsPrefsFile = preferencesFile;
             }
             else {

diff --git a/java/java.lsp.server/vscode/package.json b/java/java.lsp.server/vscode/package.json
@@ -183,6 +183,11 @@
 					"description": "Path to the file containing exported formatter settings",
 					"default": null
 				},
+				"netbeans.hints.preferences": {
+					"type": "string",
+					"description": "Path to the file containing exported hints preferences",
+					"default": null
+				},
 				"netbeans.java.onSave.organizeImports": {
 					"type": "boolean",
 					"default": true,

diff --git a/java/java.lsp.server/vscode/src/extension.ts b/java/java.lsp.server/vscode/src/extension.ts
@@ -1000,6 +1000,7 @@ function doActivateWithJDK(specifiedJDK: string | null, context: ExtensionContex
         documentSelector: documentSelectors,
         synchronize: {
             configurationSection: [
+                'netbeans.hints',
                 'netbeans.format',
                 'netbeans.java.imports',
                 'java+.runConfig.vmOptions'