Skip to content

Commit 908b2a7

Browse files
sbouchetangelozerr
authored andcommitted
build: use quarkus-ls 0.22.0 from new repo
Signed-off-by: Stephane Bouchet <sbouchet@redhat.com>
1 parent 5789b3b commit 908b2a7

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ val quteLsVersion = prop("quteLsVersion")
3838
repositories {
3939
mavenLocal()
4040
mavenCentral()
41-
maven { url = uri("https://repository.jboss.org/nexus/content/repositories/snapshots") }
41+
maven { url = uri("https://raw.githubusercontent.com/redhat-developer/quarkus-ls/maven/") }
4242
maven { url = uri("https://repository.jboss.org/nexus/content/groups/public") }
4343
maven { url = uri("https://repo.eclipse.org/content/repositories/lsp4mp-snapshots") }
4444
maven { url = uri("https://repo.eclipse.org/content/repositories/lsp4mp-releases") }

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ gradleVersion=8.6
2020
channel=nightly
2121
quarkusVersion=3.15.1
2222
lsp4mpVersion=0.13.0
23-
quarkusLsVersion=0.21.0
24-
quteLsVersion=0.21.0
23+
quarkusLsVersion=0.22.0
24+
quteLsVersion=0.22.0
2525
# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
2626
kotlin.stdlib.default.dependency=false
2727
# Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ devtools-common-ui-test = "0.4.4-SNAPSHOT"
99
testlogger = "4.0.0"
1010
kotlin = "2.0.20"
1111
changelog = "2.2.0"
12-
gradleIntelliJPlugin = "2.2.1"
12+
gradleIntelliJPlugin = "2.5.0"
1313

1414
[libraries]
1515
junit = { group = "junit", name = "junit", version.ref = "junit" }

src/main/java/com/redhat/devtools/intellij/qute/lsp/QuteLanguageClient.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ public void dispose() {
7777
* Send the notification qute/dataModelChanged with the project Uris to
7878
* refresh data model used in Qute Template.
7979
*
80-
* @param uris the project uris where the data model must be refreshed.
80+
* @param projectChangeInfos the project change info where the data model must be refreshed.
8181
*/
82-
private void notifyQuteDataModelChanged(Set<String> uris) {
82+
private void notifyQuteDataModelChanged(Set<JavaDataModelChangeEvent.ProjectChangeInfo> projectChangeInfos) {
8383
QuteLanguageServerAPI server = (QuteLanguageServerAPI) getLanguageServer();
8484
if (server != null) {
8585
JavaDataModelChangeEvent event = new JavaDataModelChangeEvent();
86-
event.setProjectURIs(uris);
86+
event.setProjects(projectChangeInfos);
8787
server.dataModelChanged(event);
8888
}
8989
}
@@ -116,9 +116,9 @@ public void librariesChanged() {
116116
// The language client has been disposed, ignore changes in libraries
117117
return;
118118
}
119-
Set<String> uris = new HashSet<>();
120-
uris.add(PsiQuteProjectUtils.getProjectURI(getProject()));
121-
notifyQuteDataModelChanged(uris);
119+
Set<JavaDataModelChangeEvent.ProjectChangeInfo> projectChangeInfo = new HashSet<>();
120+
projectChangeInfo.add(new JavaDataModelChangeEvent.ProjectChangeInfo(PsiQuteProjectUtils.getProjectURI(getProject())));
121+
notifyQuteDataModelChanged(projectChangeInfo);
122122
}
123123

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

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ public void testWorkspaceSymbols() throws Exception {
8686
si("@/play/id: GET", r(9, 18, 26)), //
8787
si("@/play/start: GET", r(13, 18, 23)), //
8888
// From Renarde JAR (RenardeSecurityController)
89-
si("@/_renarde/security/login-{provider}: GET", r(41, 16, 30)),
90-
si("@/_renarde/security/logout: GET", r(52, 20, 26)),
91-
si("@/_renarde/security/github-success: GET", r(58, 16, 29)),
92-
si("@/_renarde/security/twitter-success: GET", r(65, 16, 30)),
93-
si("@/_renarde/security/oidc-success: GET", r(72, 16, 30)),
94-
si("@/_renarde/security/oidc-success: POST", r(79, 16, 31)));
89+
si("@/_renarde/security/login-{provider}: GET", r(24, 16, 30)),
90+
si("@/_renarde/security/logout: GET", r(27, 37, 43)),
91+
si("@/_renarde/security/github-success: GET", r(31, 16, 29)),
92+
si("@/_renarde/security/twitter-success: GET", r(35, 16, 30)),
93+
si("@/_renarde/security/oidc-success: GET", r(39, 16, 30)),
94+
si("@/_renarde/security/oidc-success: POST", r(44, 16, 31)));
9595
}
9696

9797
}

0 commit comments

Comments
 (0)