Skip to content

Fixed messages not being reported when they are associated with a package-sourced library #102

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
brynrhodes merged 4 commits into from
Jan 10, 2026
Merged

Fixed messages not being reported when they are associated with a package-sourced library #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1e9e0f
Update version to 4.1.1
Jan 10, 2026
e9d494f
Fixed compiler options not loading in translation
Jan 10, 2026
3b0f0d5
Fixed diagnostics service reporting when messages are associated with…
Jan 10, 2026
84735a4
Spotless
Jan 10, 2026
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 core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.opencds.cqf.cql.ls</groupId>
<artifactId>cql-ls</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion debug/server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.opencds.cqf.cql.ls</groupId>
<artifactId>cql-ls</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion debug/service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.opencds.cqf.cql.ls</groupId>
<artifactId>cql-ls</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion ls/server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.opencds.cqf.cql.ls</groupId>
<artifactId>cql-ls</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
5 changes: 3 additions & 2 deletions ls/server/src/main/java/org/opencds/cqf/cql/ls/server/manager/CompilerOptionsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,13 @@ protected CqlCompilerOptions readOptions(URI rootUri) {

CqlCompilerOptions options = null;

var optionsUri = Uris.addPath(rootUri, "/cql-options.json");
var optionsUri = Uris.addPath(rootUri, "/cql/cql-options.json");
InputStream input = contentService.read(optionsUri);

if (input != null) {
// TODO: Why is this using fromFile and not fromSource?
options = CqlTranslatorOptions.fromFile(Path("/cql-options.json")).getCqlCompilerOptions();
options =
CqlTranslatorOptions.fromFile(Path("/cql/cql-options.json")).getCqlCompilerOptions();
} else {
log.info(String.format("%s not found, using default options", optionsUri.toString()));
options = CqlTranslatorOptions.defaultOptions().getCqlCompilerOptions();
Expand Down
16 changes: 12 additions & 4 deletions ls/server/src/main/java/org/opencds/cqf/cql/ls/server/service/DiagnosticsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,18 @@ public Map<URI, Set<Diagnostic>> lint(URI uri) {
.collect(Collectors.toList());

URI root = Uris.getHead(uri);
List<Pair<VersionedIdentifier, URI>> libraryUriList = uniqueLibraries.stream()
.map(x -> Pair.of(
x, this.contentService.locate(root, x).iterator().next()))
.collect(Collectors.toList());
var libraryUriList = new ArrayList<Pair<VersionedIdentifier, URI>>();
for (var libraryIdentifier : uniqueLibraries) {
var uris = this.contentService.locate(root, libraryIdentifier);
if (uris != null && !uris.isEmpty()) {
libraryUriList.add(Pair.of(libraryIdentifier, uris.iterator().next()));
} else {
// The message is associated with a library loaded from outside the content service (e.g. an npm
// library)
// So associate the message with the current uri
libraryUriList.add(Pair.of(libraryIdentifier, uri));
}
}

Map<VersionedIdentifier, URI> libraryUris = new HashMap<>();
for (Pair<VersionedIdentifier, URI> p : libraryUriList) {
Expand Down
2 changes: 1 addition & 1 deletion ls/service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.opencds.cqf.cql.ls</groupId>
<artifactId>cql-ls</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/debug/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.opencds.cqf.cql.ls</groupId>
<artifactId>cql-ls</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>org.opencds.cqf.cql.ls</groupId>
<artifactId>cql-ls</artifactId>
<packaging>pom</packaging>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1</version>

<name>CQL Language Server</name>
<description>A Language Server for CQL implementing the LSP</description>
Expand Down