Merge pull request #7 from dylon/dylon/cleanup-and-testing

Clean-up and testing (addressing tasks from issue #6)

.gitignore

@@ -8,12 +8,16 @@
 !/client/package.json
 !/client/src/*.ts
 !/client/testFixture/*.txt
+!/client/test/spec/**/*.ts
 !/client/tsconfig.json
 !/.gitignore
+!/.mocharc.json
 !/package.json
 !/README.md
 !/scripts/*.sh
 !/server/package.json
 !/server/src/*.ts
+!/server/test/bin/lfortran
+!/server/test/spec/**/*.ts
 !/server/tsconfig.json
 !/tsconfig.json

.mocharc.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "https://json.schemastore.org/mocharc.json",
+  "require": "tsx"
+}

README.md

@@ -60,3 +60,7 @@ This will generate a .vsix file in your `lfortran-lsp` folder, which can then be
 imported as an extension. You can go to extensions in VSCode, click on `...` on
 the top right, click on “Install from VSIX” and select the VSIX, and done (may
 require a reload). The extension has now been installed.
+
+## Testing
+
+To test the extension, please run `npm run test`.

client/src/extension.ts

@@ -4,62 +4,82 @@
  * ------------------------------------------------------------------------------------------ */
 
 import * as path from 'path';
-import { workspace, ExtensionContext } from 'vscode';
 
 import {
-	LanguageClient,
-	LanguageClientOptions,
-	ServerOptions,
-	TransportKind
+  ExtensionContext,
+  workspace
+} from 'vscode';
+
+import {
+  LanguageClient,
+  LanguageClientOptions,
+  ServerOptions,
+  TransportKind
 } from 'vscode-languageclient/node';
 
 let client: LanguageClient;
 
 export function activate(context: ExtensionContext) {
-	// The server is implemented in node
-	const serverModule = context.asAbsolutePath(
-		path.join('out', 'server', 'src', 'server.js')
-	);
-	// The debug options for the server
-	// --inspect=6009: runs the server in Node's Inspector mode so VS Code can attach to the server for debugging
-	const debugOptions = { execArgv: ['--nolazy', '--inspect=6009'] };
 
-	// 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: { module: serverModule, transport: TransportKind.ipc },
-		debug: {
-			module: serverModule,
-			transport: TransportKind.ipc,
-			options: debugOptions
-		}
-	};
+  // The server is implemented in node
+  const serverModule = context.asAbsolutePath(
+    path.join('out', 'server', 'src', 'server.js')
+  );
+
+  // The debug options for the server
+  // -----------------------------------------------------------------------
+  // --inspect=6009: runs the server in Node's Inspector mode so VS Code can
+  //                 attach to the server for debugging
+  const debugOptions = {
+    execArgv: [
+      '--nolazy',
+      '--inspect=6009'
+    ]
+  };
+
+  // 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: {
+      module: serverModule,
+      transport: TransportKind.ipc
+    },
+    debug: {
+      module: serverModule,
+      transport: TransportKind.ipc,
+      options: debugOptions
+    }
+  };
 
-	// Options to control the language client
-	const clientOptions: LanguageClientOptions = {
-		// Register the server for plain text documents
-		documentSelector: [{ scheme: 'file', language: 'LFortran' }],
-		synchronize: {
-			// Notify the server about file changes to '.clientrc files contained in the workspace
-			fileEvents: workspace.createFileSystemWatcher('**/.clientrc')
-		}
-	};
+  // Options to control the language client
+  const clientOptions: LanguageClientOptions = {
+    // Register the server for plain text documents
+    documentSelector: [{
+      scheme: 'file',
+      language: 'fortran'
+    }],
+    synchronize: {
+      // Notify the server about file changes to '.clientrc files contained in
+      // the workspace
+      fileEvents: workspace.createFileSystemWatcher('**/.clientrc')
+    }
+  };
 
-	// Create the language client and start the client.
-	client = new LanguageClient(
-		'LFortranLanguageServer',
-		'LFortran Language Server',
-		serverOptions,
-		clientOptions
-	);
+  // Create the language client and start the client.
+  client = new LanguageClient(
+    'LFortranLanguageServer',
+    'LFortran Language Server',
+    serverOptions,
+    clientOptions
+  );
 
-	// Start the client. This will also launch the server
-	client.start();
+  // Start the client. This will also launch the server
+  client.start();
 }
 
 export function deactivate(): Thenable<void> | undefined {
-	if (!client) {
-		return undefined;
-	}
-	return client.stop();
+  if (!client) {
+    return undefined;
+  }
+  return client.stop();
 }