Skip to content

Commit e81a69a

Browse files
authored
Merge pull request #708 from melt-umn/feature/langserver
Bump version number in VS Code extension and update dependencies
2 parents 7f27579 + 5114807 commit e81a69a

File tree

8 files changed

+857
-233
lines changed

8 files changed

+857
-233
lines changed

language-server/.project

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
</natures>
1717
<filteredResources>
1818
<filter>
19-
<id>1654026957331</id>
19+
<id>1665108614003</id>
2020
<name></name>
2121
<type>30</type>
2222
<matcher>
2323
<id>org.eclipse.core.resources.regexFilterMatcher</id>
24-
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
24+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
2525
</matcher>
2626
</filter>
2727
</filteredResources>

language-server/langserver/src/main/java/edu/umn/cs/melt/silver/langserver/SilverLanguageService.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -373,12 +373,19 @@ private void doBuild(Map<String, Integer> buildVersions) {
373373
ConfigurationItem enableMWDAConfigItem = new ConfigurationItem();
374374
enableMWDAConfigItem.setSection("silver.enableMWDA");
375375
ConfigurationParams configParams = new ConfigurationParams(List.of(enableMWDAConfigItem));
376+
boolean newEnableMWDA = enableMWDA;
376377
try {
377-
enableMWDA = ((JsonPrimitive)client.configuration(configParams).get().get(0)).getAsBoolean();
378+
newEnableMWDA = ((JsonPrimitive)client.configuration(configParams).get().get(0)).getAsBoolean();
378379
} catch (InterruptedException | ExecutionException e) {
379380
// Ignore, getting the settings sometimes fails when a build is triggered during initialization
380381
}
381382

383+
if (newEnableMWDA && !enableMWDA) {
384+
// Do a clean build when the MWDA is initially enabled
385+
cleanBuild = true;
386+
}
387+
enableMWDA = newEnableMWDA;
388+
382389
if (enableMWDA) {
383390
System.err.println("MWDA enabled");
384391
args.add("--warn-all");

language-server/launcher/.project

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
</natures>
2323
<filteredResources>
2424
<filter>
25-
<id>1654026957327</id>
25+
<id>1665108613767</id>
2626
<name></name>
2727
<type>30</type>
2828
<matcher>
2929
<id>org.eclipse.core.resources.regexFilterMatcher</id>
30-
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
30+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
3131
</matcher>
3232
</filter>
3333
</filteredResources>

language-server/launcher/.settings/org.eclipse.jdt.core.prefs

+567
Large diffs are not rendered by default.

support/vs-code/silverlsp/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,11 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
66

77
## [Unreleased]
88

9+
## [0.0.2]
10+
- Add support for specifying a jar containing an alternate Silver parser
11+
- Fix issue with semantic tokens for lines contianing tabs
12+
- Internal refactoring to move reusable lsp4j utilities
13+
- Fixes in the flow analysis and build process corresponding to changes in the forthcoming 0.4.5 release of Silver
14+
15+
# [0.0.1]
916
- Initial release

support/vs-code/silverlsp/README.md

+1-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This extension provides language server protocol-based editor features for [Silv
1111

1212
## Requirements
1313

14-
Running this extension requires Java >= 11.
14+
Running this extension requires Java 11. Issues have been noted with newer versions of Java.
1515

1616
## Extension Settings
1717

@@ -25,9 +25,3 @@ This extension contributes the following settings:
2525
## Known Issues
2626

2727
The use of Copper for semantic tokens means that in case of a syntax error, highlighting is not shown for the rest of the file after the syntax error.
28-
29-
## Release Notes
30-
31-
### 0.0.1
32-
33-
Initial release of silverlsp.

0 commit comments

Comments
 (0)