Merge pull request #708 from melt-umn/feature/langserver

Bump version number in VS Code extension and update dependencies
melt-umn · Oct 8, 2022 · e81a69a · e81a69a
2 parents 7f27579 + 5114807
commit e81a69a
Show file tree

Hide file tree

Showing 8 changed files with 857 additions and 233 deletions.
diff --git a/language-server/.project b/language-server/.project
@@ -16,12 +16,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1654026957331</id>
+			<id>1665108614003</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

diff --git a/...ver/langserver/src/main/java/edu/umn/cs/melt/silver/langserver/SilverLanguageService.java b/...ver/langserver/src/main/java/edu/umn/cs/melt/silver/langserver/SilverLanguageService.java
@@ -373,12 +373,19 @@ private void doBuild(Map<String, Integer> buildVersions) {
         ConfigurationItem enableMWDAConfigItem = new ConfigurationItem();
         enableMWDAConfigItem.setSection("silver.enableMWDA");
         ConfigurationParams configParams = new ConfigurationParams(List.of(enableMWDAConfigItem));
+        boolean newEnableMWDA = enableMWDA;
         try {
-            enableMWDA = ((JsonPrimitive)client.configuration(configParams).get().get(0)).getAsBoolean();
+            newEnableMWDA = ((JsonPrimitive)client.configuration(configParams).get().get(0)).getAsBoolean();
         } catch (InterruptedException | ExecutionException e) {
             // Ignore, getting the settings sometimes fails when a build is triggered during initialization
         }
 
+        if (newEnableMWDA && !enableMWDA) {
+            // Do a clean build when the MWDA is initially enabled
+            cleanBuild = true;
+        }
+        enableMWDA = newEnableMWDA;
+
         if (enableMWDA) {
             System.err.println("MWDA enabled");
             args.add("--warn-all");

diff --git a/language-server/launcher/.project b/language-server/launcher/.project
@@ -22,12 +22,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1654026957327</id>
+			<id>1665108613767</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

diff --git a/language-server/launcher/.settings/org.eclipse.jdt.core.prefs b/language-server/launcher/.settings/org.eclipse.jdt.core.prefs
diff --git a/support/vs-code/silverlsp/CHANGELOG.md b/support/vs-code/silverlsp/CHANGELOG.md
@@ -6,4 +6,11 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 
 ## [Unreleased]
 
+## [0.0.2]
+- Add support for specifying a jar containing an alternate Silver parser
+- Fix issue with semantic tokens for lines contianing tabs
+- Internal refactoring to move reusable lsp4j utilities
+- Fixes in the flow analysis and build process corresponding to changes in the forthcoming 0.4.5 release of Silver
+
+# [0.0.1]
 - Initial release
diff --git a/support/vs-code/silverlsp/README.md b/support/vs-code/silverlsp/README.md
@@ -11,7 +11,7 @@ This extension provides language server protocol-based editor features for [Silv
 
 ## Requirements
 
-Running this extension requires Java >= 11.
+Running this extension requires Java 11.  Issues have been noted with newer versions of Java.
 
 ## Extension Settings
 
@@ -25,9 +25,3 @@ This extension contributes the following settings:
 ## Known Issues
 
 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.
-
-## Release Notes
-
-### 0.0.1
-
-Initial release of silverlsp.