Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.1</version>
<version>4.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion debug/server/pom.xml
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.1</version>
<version>4.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion debug/service/pom.xml
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.1</version>
<version>4.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion ls/server/pom.xml
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.1</version>
<version>4.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,20 @@ protected void clearOptions(URI uri) {
}

protected CqlCompilerOptions readOptions(URI rootUri) {

CqlCompilerOptions options = null;

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/cql-options.json")).getCqlCompilerOptions();
try {
options = CqlTranslatorOptions.fromFile(Path(optionsUri.toURL().getPath()))
.getCqlCompilerOptions();
} catch (Exception e) {
log.info(String.format(
"Exception %s attempting to load options from %s, using default options",
e.getMessage(), optionsUri.toString()));
}
} else {
log.info(String.format("%s not found, using default options", optionsUri.toString()));
options = CqlTranslatorOptions.defaultOptions().getCqlCompilerOptions();
Expand Down
2 changes: 1 addition & 1 deletion ls/service/pom.xml
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.1</version>
<version>4.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/debug/pom.xml
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.1</version>
<version>4.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
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.1</version>
<version>4.1.2</version>

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