From 89d8dbb2d50d8116d3f25b8f8c54c2fa60e71fa8 Mon Sep 17 00:00:00 2001
From: Achal Talati <achal.talati@oracle.com>
Date: Fri, 12 Apr 2024 11:17:39 +0530
Subject: [PATCH] added hints preferences option in the vscode extension

Signed-off-by: Achal Talati <achal.talati@oracle.com>
---
 .../java/lsp/server/protocol/TextDocumentServiceImpl.java    | 2 +-
 java/java.lsp.server/vscode/package.json                     | 5 +++++
 java/java.lsp.server/vscode/src/extension.ts                 | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
index deefb86e0978..b33ff46f4643 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
+++ b/java/java.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
index a366f4c00879..78595718c8ef 100644
--- 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
index bd19dab48b36..913484608c42 100644
--- 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'