Skip to content

build: use quarkus-ls 0.22.0 from new repo #1448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
angelozerr merged 1 commit into from
Apr 22, 2025
Merged

build: use quarkus-ls 0.22.0 from new repo #1448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ val quteLsVersion = prop("quteLsVersion")
repositories {
mavenLocal()
mavenCentral()
maven { url = uri("https://repository.jboss.org/nexus/content/repositories/snapshots") }
maven { url = uri("https://raw.githubusercontent.com/redhat-developer/quarkus-ls/maven/") }
maven { url = uri("https://repository.jboss.org/nexus/content/groups/public") }
maven { url = uri("https://repo.eclipse.org/content/repositories/lsp4mp-snapshots") }
maven { url = uri("https://repo.eclipse.org/content/repositories/lsp4mp-releases") }
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ gradleVersion=8.6
channel=nightly
quarkusVersion=3.15.1
lsp4mpVersion=0.13.0
quarkusLsVersion=0.21.0
quteLsVersion=0.21.0
quarkusLsVersion=0.22.0
quteLsVersion=0.22.0
# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
kotlin.stdlib.default.dependency=false
# Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ devtools-common-ui-test = "0.4.4-SNAPSHOT"
testlogger = "4.0.0"
kotlin = "2.0.20"
changelog = "2.2.0"
gradleIntelliJPlugin = "2.2.1"
gradleIntelliJPlugin = "2.5.0"

[libraries]
junit = { group = "junit", name = "junit", version.ref = "junit" }
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/com/redhat/devtools/intellij/qute/lsp/QuteLanguageClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ public void dispose() {
* Send the notification qute/dataModelChanged with the project Uris to
* refresh data model used in Qute Template.
*
* @param uris the project uris where the data model must be refreshed.
* @param projectChangeInfos the project change info where the data model must be refreshed.
*/
private void notifyQuteDataModelChanged(Set<String> uris) {
private void notifyQuteDataModelChanged(Set<JavaDataModelChangeEvent.ProjectChangeInfo> projectChangeInfos) {
QuteLanguageServerAPI server = (QuteLanguageServerAPI) getLanguageServer();
if (server != null) {
JavaDataModelChangeEvent event = new JavaDataModelChangeEvent();
event.setProjectURIs(uris);
event.setProjects(projectChangeInfos);
server.dataModelChanged(event);
}
}
Expand Down Expand Up @@ -116,9 +116,9 @@ public void librariesChanged() {
// The language client has been disposed, ignore changes in libraries
return;
}
Set<String> uris = new HashSet<>();
uris.add(PsiQuteProjectUtils.getProjectURI(getProject()));
notifyQuteDataModelChanged(uris);
Set<JavaDataModelChangeEvent.ProjectChangeInfo> projectChangeInfo = new HashSet<>();
projectChangeInfo.add(new JavaDataModelChangeEvent.ProjectChangeInfo(PsiQuteProjectUtils.getProjectURI(getProject())));
notifyQuteDataModelChanged(projectChangeInfo);
}

@Override
Expand All @@ -127,14 +127,14 @@ public void sourceFilesChanged(Set<Pair<VirtualFile, Module>> sources) {
// The language client has been disposed, ignore changes in Java source files
return;
}
Set<String> uris = sources.stream()
Set<JavaDataModelChangeEvent.ProjectChangeInfo> projectChangeInfos = sources.stream()
// qute/dataModelChanged must be sent only if there are some Java files which are changed
.filter(pair -> PsiMicroProfileProjectManager.isJavaFile(pair.getFirst()))
.map(pair -> pair.getSecond())
.map(module -> PsiUtilsLSImpl.getProjectURI(module))
.map(module -> new JavaDataModelChangeEvent.ProjectChangeInfo(PsiUtilsLSImpl.getProjectURI(module)))
.collect(Collectors.toSet());
if (!uris.isEmpty()) {
notifyQuteDataModelChanged(uris);
if (!projectChangeInfos.isEmpty()) {
notifyQuteDataModelChanged(projectChangeInfos);
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/test/java/com/redhat/microprofile/psi/quarkus/renarde/RenardeJaxRsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@ public void testWorkspaceSymbols() throws Exception {
si("@/play/id: GET", r(9, 18, 26)), //
si("@/play/start: GET", r(13, 18, 23)), //
// 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)));
si("@/_renarde/security/login-{provider}: GET", r(24, 16, 30)),
Copy link
Contributor Author

@sbouchet sbouchet Apr 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is actually a revert of 34b7588 .
dunno why...

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)));
}

}
Loading