merge: PR #219 from bug/218-windows-platform-support-staging

218 - Windows platform support

Author: 0xmemorygrinder

.github/workflows/ci.yml

@@ -63,7 +63,7 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
-      - run: yarn install --frozen-lockfile
+      - run: yarn install --immutable
         if: steps.yarn-cache.outputs.cache-hit != 'true'
 
       - run: yarn workspace ${{ matrix.workspace.name }} run lint
@@ -99,7 +99,7 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
-      - run: yarn install --frozen-lockfile
+      - run: yarn install --immutable
         if: steps.yarn-cache.outputs.cache-hit != 'true'
 
       - run: yarn workspace ${{ matrix.workspace.name }} run format

.github/workflows/execute-yarn-workspace-command.yml

@@ -104,7 +104,7 @@ jobs:
             ${{ runner.os }}-yarn-
       
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
         if: steps.yarn-cache.outputs.cache-hit != 'true'
 
       - name: Run command (with target)

.github/workflows/publish-extension-manual.yml

@@ -100,7 +100,7 @@ jobs:
 
       - name: Install
         run: |
-          yarn install --frozen-lockfile
+          yarn install --immutable
 
       - name: Get tag prefix
         id: get-tag-prefix

.github/workflows/publish-targeted-extension.yml

@@ -115,7 +115,7 @@ jobs:
             ${{ runner.os }}-yarn-
       
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
         if: steps.yarn-cache.outputs.cache-hit != 'true'
 
       - name: Build

.pnp.cjs

@@ -18,7 +18,7 @@ fs.readdir('target', { withFileTypes: true }, (err, dirs) => {
         return;
       }
     const files = entries.filter(file => file.isFile()).map(file => file.name);
-    const serverBinaries = files.filter(file => file.endsWith('-server'));
+    const serverBinaries = files.filter(file => file.endsWith('-server') || file.endsWith('-server.exe'));
     serverBinaries.forEach(binary => {
         fs.copyFile(`target/${dir}/${binary}`, `${outputFolder}/${binary}`, (err) => {
             if (err) {

.pnp.loader.mjs

@@ -2,7 +2,7 @@
   "name": "osmium-solidity-extension",
   "displayName": "Osmium Solidity",
   "description": "",
-  "version": "0.2.1",
+  "version": "0.1.3",
   "publisher": "OsmiumToolchains",
   "repository": {
     "type": "git",

toolchains/solidity/core/scripts/copy-core.js

@@ -4,7 +4,7 @@
  * ------------------------------------------------------------------------------------------ */
 
 import * as path from 'path';
-import { workspace, ExtensionContext, Uri } from 'vscode';
+import { workspace, ExtensionContext } from 'vscode';
 import { TextDecoder } from 'util';
 
 import {
@@ -13,53 +13,18 @@ import {
 	ServerOptions,
 	TransportKind
 } from 'vscode-languageclient/node';
+import { createLinterClient } from './linter';
 
-let client: LanguageClient;
 
-export async function activate(context: ExtensionContext) {
-	// The server is implemented in node
-	const serverBinary = context.asAbsolutePath(
-		path.join('dist', 'linter-server')
-	);
-
-	// If the extension is launched in debug mode then the debug server options are used
-	// Otherwise the run options are used
-	const serverOptions: ServerOptions = {
-		run: { command: serverBinary, transport: TransportKind.stdio },
-		debug: {
-			command: serverBinary,
-			transport: TransportKind.stdio,
-		}
-	};
-
-	// Options to control the language client
-	const clientOptions: LanguageClientOptions = {
-		// Register the server for plain text documents
-		documentSelector: [{ scheme: 'file', language: 'solidity' }],
-		synchronize: {
-			// Notify the server about file changes to '.clientrc files contained in the workspace
-			fileEvents: workspace.createFileSystemWatcher('**/.solidhunter.json')
-		}
-	};
-
-	// Create the language client and start the client.
-	client = new LanguageClient(
-		'osmium-solidity',
-		'Osmium Solidity Language Server',
-		serverOptions,
-		clientOptions
-	);
+let linterClient: LanguageClient;
 
-	client.onRequest('osmium/getContent', async (params) => {
-    	const contentUint8 = await workspace.fs.readFile(Uri.parse(params.uri));
-    	const content = new TextDecoder().decode(contentUint8);
-    	return {
-			content,
-		};
-	});
+export async function activate(context: ExtensionContext) {
+	linterClient = createLinterClient(context);
 
-	// Start the client. This will also launch the server
-	client.start();
+	// Push the disposable to the context's subscriptions so that the
+	// client can be deactivated on extension deactivation
+	context.subscriptions.push(linterClient);
+	
 
 	const folders = workspace.workspaceFolders;
 	if (folders) {
@@ -70,10 +35,3 @@ export async function activate(context: ExtensionContext) {
 	}
 
 }
-
-export function deactivate(): Thenable<void> | undefined {
-	if (!client) {
-		return undefined;
-	}
-	return client.stop();
-}

toolchains/solidity/extension/package.json

@@ -0,0 +1,61 @@
+import * as path from 'path';
+import * as os from 'os';
+import { workspace, ExtensionContext, Uri } from "vscode";
+import {
+	LanguageClient,
+	LanguageClientOptions,
+	ServerOptions,
+	TransportKind
+} from 'vscode-languageclient/node';
+import { TextDecoder } from 'util';
+
+export function createLinterClient(context: ExtensionContext): LanguageClient {
+    // The server is implemented in node
+	const serverBinary = context.asAbsolutePath(
+		path.join(
+			'dist', 
+			os.platform().startsWith("win") ? 'linter-server.exe' : 'linter-server'
+		)
+	);
+
+	// If the extension is launched in debug mode then the debug server options are used
+	// Otherwise the run options are used
+	const serverOptions: ServerOptions = {
+		run: { command: serverBinary, transport: TransportKind.stdio },
+		debug: {
+			command: serverBinary,
+			transport: TransportKind.stdio,
+		}
+	};
+
+	// Options to control the language client
+	const clientOptions: LanguageClientOptions = {
+		// Register the server for plain text documents
+		documentSelector: [{ scheme: 'file', language: 'solidity' }],
+		synchronize: {
+			// Notify the server about file changes to '.clientrc files contained in the workspace
+			fileEvents: workspace.createFileSystemWatcher('**/.solidhunter.json')
+		}
+	};
+
+	// Create the language client and start the client.
+	const client = new LanguageClient(
+		'osmium-solidity-linter',
+		'Osmium Solidity Linter Language Server',
+		serverOptions,
+		clientOptions
+	);
+
+	client.onRequest('osmium/getContent', async (params: { uri: string}) => {
+    	const contentUint8 = await workspace.fs.readFile(Uri.parse(params.uri));
+    	const content = new TextDecoder().decode(contentUint8);
+    	return {
+			content,
+		};
+	});
+
+	// Start the client. This will also launch the server
+	client.start();
+
+    return client;
+}