fix: use language substitor

angelozerr · angelozerr · commit a3c96f9fd469 · 2025-03-22T13:54:02.000+01:00
Signed-off-by: azerr &lt;azerr@redhat.com&gt;
diff --git a/src/main/java/com/redhat/devtools/lsp4ij/LSPIJUtils.java b/src/main/java/com/redhat/devtools/lsp4ij/LSPIJUtils.java
@@ -448,6 +448,16 @@ private static boolean doOpenInEditor(@NotNull VirtualFile file,
         }
     }
 
+    @NotNull
+    public static Language getFileLanguage(@NotNull PsiFile file) {
+        // file.getLanguage() returns the initial file language
+        // but doesn't take care of the LanguageSubstitutor
+        // In IJ Quarkus, HTML file language becomes Qute file language by using the QuteLanguageSubstitutor
+        // - file.getLanguage() -> HTML language
+        // - file.getViewProvider().getBaseLanguage() -> Qute language
+        return file.getViewProvider().getBaseLanguage();
+    }
+
     /**
      * Returns the file language of the given file and null otherwise.
      *
@@ -1423,4 +1433,5 @@ public static String getProjectUri(Project project) {
                 .map(l -> new LocationData(new Location(l.getTargetUri(), l.getTargetSelectionRange() != null ? l.getTargetSelectionRange() : l.getTargetRange()), languageServer))
                 .toList();
     }
+
 }
diff --git a/src/main/java/com/redhat/devtools/lsp4ij/LanguageServersRegistry.java b/src/main/java/com/redhat/devtools/lsp4ij/LanguageServersRegistry.java
@@ -512,7 +512,7 @@ public boolean isFileSupported(@Nullable PsiFile file) {
         if (file == null) {
             return false;
         }
-        Language language = file.getLanguage();
+        Language language = LSPIJUtils.getFileLanguage(file);
         FileType fileType = file.getFileType();
         return isFileSupported(language, fileType, file.getName(), null, file, file.getProject());
     }
diff --git a/src/main/java/com/redhat/devtools/lsp4ij/LanguageServiceAccessor.java b/src/main/java/com/redhat/devtools/lsp4ij/LanguageServiceAccessor.java
@@ -484,7 +484,7 @@ private MatchedLanguageServerDefinitions getMatchedLanguageServerDefinitions(@No
         // look for running language servers via content-type
         Queue<Object> languages = new LinkedList<>();
         Set<Object> processedContentTypes = new HashSet<>();
-        Language language = psiFile.getLanguage();
+        Language language = LSPIJUtils.getFileLanguage(psiFile);
         if (language != null) {
             languages.add(language);
         }
diff --git a/src/main/java/com/redhat/devtools/lsp4ij/client/indexing/ProjectIndexingManager.java b/src/main/java/com/redhat/devtools/lsp4ij/client/indexing/ProjectIndexingManager.java
@@ -118,10 +118,11 @@ private synchronized static CompletableFuture<Void> initialize() {
      * @return the execute LSP feature status for the given Psi file.
      */
     public static ExecuteLSPFeatureStatus canExecuteLSPFeature(@Nullable PsiFile file) {
-        if (file == null) {
+        if (file == null || !LanguageServersRegistry.getInstance().isFileSupported(file)) {
+            // The file is not associated to a language server, don't execute the LSP feature.
             return ExecuteLSPFeatureStatus.NOT;
         }
-        return canExecuteLSPFeature(file.getVirtualFile(), file.getProject());
+        return doCanExecuteLSPFeature(file.getVirtualFile(), file.getProject());
     }
 
     /**
@@ -137,6 +138,11 @@ public static ExecuteLSPFeatureStatus canExecuteLSPFeature(@Nullable VirtualFile
             // The file is not associated to a language server, don't execute the LSP feature.
             return ExecuteLSPFeatureStatus.NOT;
         }
+        return doCanExecuteLSPFeature(file, project);
+    }
+
+    private static @NotNull ExecuteLSPFeatureStatus doCanExecuteLSPFeature(@Nullable VirtualFile file,
+                                                                           @NotNull Project project) {
         ProjectIndexingManager manager = getInstance(project);
         if (manager.isIndexingAll()) {
             // The file is associated to a language server, but the project is indexing

Original file line number	Diff line number	Diff line change
`@@ -448,6 +448,16 @@ private static boolean doOpenInEditor(@NotNull VirtualFile file,`
`448`	`448`	`}`
`449`	`449`	`}`
`450`	`450`
	`451`	`+ @NotNull`
	`452`	`+ public static Language getFileLanguage(@NotNull PsiFile file) {`
	`453`	`+ // file.getLanguage() returns the initial file language`
	`454`	`+ // but doesn't take care of the LanguageSubstitutor`
	`455`	`+ // In IJ Quarkus, HTML file language becomes Qute file language by using the QuteLanguageSubstitutor`
	`456`	`+ // - file.getLanguage() -> HTML language`
	`457`	`+ // - file.getViewProvider().getBaseLanguage() -> Qute language`
	`458`	`+ return file.getViewProvider().getBaseLanguage();`
	`459`	`+ }`
	`460`	`+`
`451`	`461`	`/**`
`452`	`462`	`* Returns the file language of the given file and null otherwise.`
`453`	`463`	`*`
`@@ -1423,4 +1433,5 @@ public static String getProjectUri(Project project) {`
`1423`	`1433`	`.map(l -> new LocationData(new Location(l.getTargetUri(), l.getTargetSelectionRange() != null ? l.getTargetSelectionRange() : l.getTargetRange()), languageServer))`
`1424`	`1434`	`.toList();`
`1425`	`1435`	`}`
	`1436`	`+`
`1426`	`1437`	`}`
Original file line number	Diff line number	Diff line change
`@@ -512,7 +512,7 @@ public boolean isFileSupported(@Nullable PsiFile file) {`
`512`	`512`	`if (file == null) {`
`513`	`513`	`return false;`
`514`	`514`	`}`
`515`		`- Language language = file.getLanguage();`
	`515`	`+ Language language = LSPIJUtils.getFileLanguage(file);`
`516`	`516`	`FileType fileType = file.getFileType();`
`517`	`517`	`return isFileSupported(language, fileType, file.getName(), null, file, file.getProject());`
`518`	`518`	`}`
Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,7 @@ private MatchedLanguageServerDefinitions getMatchedLanguageServerDefinitions(@No`
`484`	`484`	`// look for running language servers via content-type`
`485`	`485`	`Queue<Object> languages = new LinkedList<>();`
`486`	`486`	`Set<Object> processedContentTypes = new HashSet<>();`
`487`		`- Language language = psiFile.getLanguage();`
	`487`	`+ Language language = LSPIJUtils.getFileLanguage(psiFile);`
`488`	`488`	`if (language != null) {`
`489`	`489`	`languages.add(language);`
`490`	`490`	`}`