fix: fix local dev when using local build of LSP4IJ (#1440)

* fix: fix local dev when using local build of LSP4IJ

Signed-off-by: Stephane Bouchet <sbouchet@redhat.com>

* fix: fix unit test

Signed-off-by: Stephane Bouchet <sbouchet@redhat.com>

---------

Signed-off-by: Stephane Bouchet <sbouchet@redhat.com>

Author: sbouchet

build.gradle.kts

@@ -88,7 +88,8 @@ dependencies {
         if (localLsp4ij.isDirectory) {
             // In case Gradle fails to build because it can't find some missing jar, try deleting
             // ~/.gradle/caches/modules-2/files-2.1/com.jetbrains.intellij.idea/unzipped.com.jetbrains.plugins/com.redhat.devtools.lsp4ij*
-            platformPlugins.add(localLsp4ij.toString())
+            println("use local build of LSP4IJ")
+            localPlugin(localLsp4ij.toString())
         } else {
             // When running on CI or when there's no local lsp4ij
             val latestLsp4ijNightlyVersion = fetchLatestLsp4ijNightlyVersion()
@@ -97,8 +98,6 @@ dependencies {
         //Uses `platformPlugins` property from the gradle.properties file.
         platformPlugins.addAll(properties("platformPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) }.get())
         plugins(platformPlugins)
-        // for local plugin -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin-faq.html#how-to-add-a-dependency-on-a-plugin-available-in-the-file-system
-        //plugins.set(listOf(file("/path/to/plugin/")))
         // Print plugins
         println("bundledPlugins: $platformBundledPlugins")
         println("marketplacePlugins: $platformPlugins")

src/main/java/com/redhat/devtools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java

@@ -28,10 +28,9 @@
 import org.eclipse.lsp4j.SymbolKind;
 
 import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -53,7 +52,7 @@ public void collectSymbols(Module project, IPsiUtils utils, List<SymbolInformati
 
 		JaxRsContext jaxrsContext = new JaxRsContext(project);
 		Set<PsiClass> jaxrsTypes = getAllJaxRsTypes(project, utils, monitor);
-		if (jaxrsTypes == null || monitor.isCanceled()) {
+		if (monitor.isCanceled()) {
 			return;
 		}
 		List<JaxRsMethodInfo> methodsInfo = new ArrayList<>();
@@ -102,20 +101,19 @@ private static Set<PsiClass> getAllJaxRsTypes(Module javaProject, IPsiUtils util
 		for (IJaxRsInfoProvider provider : JaxRsInfoProviderRegistry.getInstance().getProviders()) {
 			jaxrsTypes.addAll(provider.getAllJaxRsClasses(javaProject, utils,monitor));
 			if (monitor.isCanceled()) {
-				return null;
+				return Collections.emptySet();
 			}
 		}
 		return jaxrsTypes;
 	}
 
-	private static SymbolInformation createSymbol(JaxRsMethodInfo methodInfo, IPsiUtils utils) throws MalformedURLException, URISyntaxException {
+	private static SymbolInformation createSymbol(JaxRsMethodInfo methodInfo, IPsiUtils utils) throws MalformedURLException {
 		TextRange sourceRange = methodInfo.getJavaMethod().getNameIdentifier().getTextRange();
 		Range r = utils.toRange(methodInfo.getJavaMethod(), sourceRange.getStartOffset(), sourceRange.getLength());
 		Location location = new Location(methodInfo.getDocumentUri(), r);
 
 		StringBuilder nameBuilder = new StringBuilder("@");
-		URL url = new URI(methodInfo.getUrl()).toURL();
-		String path = url.getPath();
+		String path = new URL(methodInfo.getUrl()).getPath();
 		nameBuilder.append(path);
 		nameBuilder.append(": ");
 		nameBuilder.append(methodInfo.getHttpMethod());

src/test/java/com/redhat/devtools/intellij/quarkus/completion/MavenApplicationPropertiesCompletionTest.java

@@ -19,6 +19,7 @@
 import com.redhat.devtools.intellij.MavenEditorTest;
 import com.redhat.devtools.intellij.lsp4mp4ij.psi.core.MicroProfileMavenProjectName;
 import com.redhat.devtools.intellij.quarkus.QuarkusDeploymentSupport;
+import com.redhat.devtools.lsp4ij.client.indexing.ProjectIndexingManager;
 import org.junit.Test;
 
 import java.io.File;
@@ -38,16 +39,18 @@ public void testBooleanCompletion() throws Exception {
 		codeInsightTestFixture.performEditorAction(IdeActions.ACTION_EDITOR_MOVE_LINE_END);
 		codeInsightTestFixture.performEditorAction(IdeActions.ACTION_EDITOR_START_NEW_LINE);
 		insertLine("quarkus.arc.auto-inject-fields=");
-		LookupElement[] elements = codeInsightTestFixture.completeBasic();
-		assertNotNull(elements);
-		assertEquals(2, elements.length);
+        ProjectIndexingManager.waitForIndexingAll().thenRunAsync(() -> {
+            LookupElement[] elements = codeInsightTestFixture.completeBasic();
+            assertNotNull(elements);
+            assertEquals(2, elements.length);
+        });
 	}
 
 	private void insertLine(String s) throws InterruptedException {
 		for (int i = 0; i < s.length(); ++i) {
 			codeInsightTestFixture.type(s.charAt(i));
 		}
-		Thread.sleep(1000);
+		Thread.sleep(100);
 	}
 
 	protected Module loadMavenProject(String projectName) throws Exception {

src/test/java/com/redhat/microprofile/psi/quarkus/renarde/RenardeJaxRsTest.java

@@ -85,13 +85,13 @@ public void testWorkspaceSymbols() throws Exception {
                 si("@/about: GET", r(25, 28, 33)), //
                 si("@/play/id: GET", r(9, 18, 26)), //
                 si("@/play/start: GET", r(13, 18, 23)), //
-                // From Renarde JAR
-                si("@/_renarde/security/login-{provider}: GET", r(24, 16, 30)),
-                si("@/_renarde/security/logout: GET", r(27, 37, 43)),
-                si("@/_renarde/security/github-success: GET", r(31, 16, 29)),
-                si("@/_renarde/security/twitter-success: GET", r(35, 16, 30)),
-                si("@/_renarde/security/oidc-success: GET", r(39, 16, 30)),
-                si("@/_renarde/security/oidc-success: POST", r(44, 16, 31)));
+                // From Renarde JAR (RenardeSecurityController)
+                si("@/_renarde/security/login-{provider}: GET", r(41, 16, 30)),
+                si("@/_renarde/security/logout: GET", r(52, 20, 26)),
+                si("@/_renarde/security/github-success: GET", r(58, 16, 29)),
+                si("@/_renarde/security/twitter-success: GET", r(65, 16, 30)),
+                si("@/_renarde/security/oidc-success: GET", r(72, 16, 30)),
+                si("@/_renarde/security/oidc-success: POST", r(79, 16, 31)));
     }
 
 }