Dependency: Upgrade to [email protected] (#1454)

* Upgrade to [email protected]

* Clean up

* Remove macOS 10.13 vm, since it is going away anyway

azure-pipelines.yml

@@ -204,30 +204,6 @@ jobs:
     env:
       SYSTEM_ARTIFACTSDIRECTORY: $(System.ArtifactsDirectory)
 
-- job: ValidateMacOSRelease13
-  displayName: "MacOS: Validate Release (10.13)"
-  dependsOn: 
-  - Kickoff
-  - MacOS
-  pool:
-    vmImage: 'macOS-10.13'
-  variables:
-    ONI2_SHORT_COMMIT_ID: $[dependencies.Kickoff.outputs['shortCommitVariableStep.ONI2_SHORT_COMMIT_ID'] ]
-
-  steps:
-  - script: echo $(ONI2_SHORT_COMMIT_ID)
-  - script: 'echo ArtifactDir: $(System.ArtifactsDirectory)'
-    displayName: 'Echo artifact dir'
-  - task: DownloadBuildArtifacts@0
-    inputs: 
-      buildType: 'current'
-      downloadType: 'single'
-      artifactName: 'Release_Darwin'
-      downloadPath: '$(System.ArtifactsDirectory)'
-  - script: ./scripts/osx/validate-release.sh
-    env:
-      SYSTEM_ARTIFACTSDIRECTORY: $(System.ArtifactsDirectory)
-
 - job: ValidateMacOSRelease14
   displayName: "MacOS: Validate Release (10.14)"
   dependsOn: 

extensions/reason-vscode/package.json

@@ -3,7 +3,7 @@
 	"description": "IDE & Syntax support for Reason/OCaml",
 	"author": "Jared Forsyth",
 	"license": "ISC",
-	"version": "1.7.2",
+	"version": "1.7.8",
 	"publisher": "jaredly",
 	"repository": {
 		"type": "git",
@@ -39,6 +39,10 @@
 			{
 				"command": "reason-language-server.create_interface",
 				"title": "Reason: Create an interface file for this implementation file."
+			},
+			{
+				"command": "reason-language-server.dump_file_data",
+				"title": "Reason: dump data on the current file"
 			}
 		],
 		"snippets": [
@@ -78,6 +82,10 @@
 					"type": "string",
 					"description": "Provide a location for the reason-lisp lispRefmt binary"
 				},
+				"reason_language_server.mlfmt": {
+					"type": "string",
+					"description": "Provide a location for an .ml/.mli formatter"
+				},
 				"reason_language_server.format_width": {
 					"type": "number",
 					"default": 80,
@@ -117,11 +125,6 @@
 					"type": "boolean",
 					"default": true,
 					"description": "Enables autorun of bsb"
-				},
-				"reason_language_server.useOldDuneProcess": {
-					"type": "boolean",
-					"default": true,
-					"description": "Keep the old process for determining package files (for compatability, will remove soon)"
 				}
 			}
 		},
@@ -199,10 +202,5 @@
 	},
 	"devDependencies": {
 		"typescript": "^2.8.1"
-	},
-	"__metadata": {
-		"id": "8a8e3e61-d49b-47f8-b98f-b7169d624b29",
-		"publisherId": "c10ae63a-fcd5-41d7-a94f-f0cebd0bcb1c",
-		"publisherDisplayName": "Jared Forsyth"
 	}
-}
+}

extensions/reason-vscode/src/index.js

@@ -274,6 +274,24 @@ function activate(context) {
 
     vscode.commands.registerCommand('reason-language-server.show_ppxed_source', showPpxedSource);
 
+    vscode.commands.registerCommand('reason-language-server.dump_file_data', () => {
+        if (!client) {
+            return vscode.window.showInformationMessage('Language server not running');
+        }
+        const editor = vscode.window.activeTextEditor;
+        if (!editor) {
+            return vscode.window.showInformationMessage('No active editor');
+        }
+        if (editor.document.languageId !== 'ocaml' && editor.document.languageId !== 'reason') {
+            return vscode.window.showInformationMessage('Not an OCaml or Reason file');
+        }
+        client.sendRequest("custom:reasonLanguageServer/dumpFileData", {
+            "textDocument": {
+                "uri": editor.document.uri.with({scheme: 'file'}).toString(),
+            },
+        })
+    });
+
     const showAst = () => {
         if (!client) {
             return vscode.window.showInformationMessage('Language server not running');