Merge pull request #11 from bitloops/validate-all-files

added validation after initialization

Author: danias

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to the "bitloops-language" extension will be documented in t
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 
+### 0.3.0
+
+Added validation after the initialization of the workspace
+
 ### 0.2.0
 
 Added validator for semantic and syntactic errors

client/.prettierrc

@@ -0,0 +1,7 @@
+{
+  "semi": true,
+  "trailingComma": "all",
+  "singleQuote": true,
+  "printWidth": 100,
+  "tabWidth": 2
+}

client/package.json

@@ -2,7 +2,7 @@
   "name": "bitloops-server-client",
   "description": "BitLoops Server Client",
   "license": "MIT",
-  "version": "0.0.1",
+  "version": "0.3.0",
   "publisher": "Bitloops",
   "engines": {
     "vscode": "^1.63.0"

client/src/extension.ts

@@ -6,7 +6,12 @@
 import * as path from 'path';
 import { workspace, ExtensionContext } from 'vscode';
 
-import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind } from 'vscode-languageclient/node';
+import {
+  LanguageClient,
+  LanguageClientOptions,
+  ServerOptions,
+  TransportKind,
+} from 'vscode-languageclient/node';
 
 let client: LanguageClient;
 

server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bitloops-lsp-server",
   "description": "BitLoops Language Server",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "publisher": "Bitloops",
   "license": "MIT",
   "engines": {
@@ -11,6 +11,8 @@
   "scripts": {},
   "dependencies": {
     "@bitloops/bl-transpiler": "^0.2.0",
+    "fs": "^0.0.1-security",
+    "path": "^0.12.7",
     "vscode-languageserver": "^7.0.0",
     "vscode-languageserver-textdocument": "^1.0.4"
   },

server/src/parser/index.ts

@@ -26,7 +26,7 @@ export class BitloopsAnalyzer implements IAnalyzer {
         return this.diagnostics;
       }
       if (isIntermediateASTValidationErrors(intermediateModel)) {
-        this.mapValidatorErrorsToLSPDiagnostics(intermediateModel, document);
+        this.mapValidatorErrorsToLSPDiagnostics(intermediateModel);
         return this.diagnostics;
       }
       return this.diagnostics;
@@ -74,7 +74,10 @@ export class BitloopsAnalyzer implements IAnalyzer {
     }
     return this.res as TParserInputData;
   }
-  mapParserErrorsToLSPDiagnostics(parserErrors: OriginalParserError, document: TextDocument): void {
+  private mapParserErrorsToLSPDiagnostics(
+    parserErrors: OriginalParserError,
+    document: TextDocument,
+  ): void {
     parserErrors.forEach((e) => {
       this.diagnostics[e.fileId] = [];
     });
@@ -96,10 +99,7 @@ export class BitloopsAnalyzer implements IAnalyzer {
     );
   }
 
-  mapValidatorErrorsToLSPDiagnostics(
-    validatorErrors: OriginalValidatorError,
-    document: TextDocument,
-  ): void {
+  private mapValidatorErrorsToLSPDiagnostics(validatorErrors: OriginalValidatorError): void {
     validatorErrors.forEach((e) => {
       this.diagnostics[e.metadata.fileId] = [];
     });

server/src/server.ts

@@ -7,6 +7,8 @@ import {
   TextDocumentSyncKind,
   DidChangeConfigurationNotification,
   Diagnostic,
+  Connection,
+  WorkspaceFolder,
 } from 'vscode-languageserver/node.js';
 
 import { TextDocument } from 'vscode-languageserver-textdocument';
@@ -15,6 +17,9 @@ import { WorkspaceSettingsManager } from './settings.js';
 import { IAnalyzer } from './analyzer.js';
 import { ILspClient } from './lsp-client.js';
 import { BitloopsAnalyzer } from './parser/index.js';
+import * as fs from 'fs';
+import * as path from 'path';
+
 // Create a connection for the server, using Node's IPC as a transport.
 // Also include all preview / proposed LSP features.
 
@@ -32,6 +37,7 @@ export class BitloopsServer {
   private hasConfigurationCapability = false;
   private hasWorkspaceFolderCapability = false;
   private hasDiagnosticRelatedInformationCapability = false;
+  private workspaceFolders: WorkspaceFolder[] = [];
 
   constructor(lspClient: ILspClient, connection: _Connection) {
     // Create a simple text document manager.
@@ -50,6 +56,8 @@ export class BitloopsServer {
   // }
 
   public onInitialize(params: InitializeParams): InitializeResult {
+    this.workspaceFolders = params.workspaceFolders;
+
     const capabilities = params.capabilities;
     this.hasConfigurationCapability = !!(
       capabilities.workspace && !!capabilities.workspace.configuration
@@ -75,6 +83,7 @@ export class BitloopsServer {
         },
       };
     }
+
     return result;
   }
 
@@ -83,6 +92,7 @@ export class BitloopsServer {
       // Register for all configuration changes.
       this.connection.client.register(DidChangeConfigurationNotification.type, undefined);
     }
+    this.validateWorkspace(this.workspaceFolders);
     if (this.hasWorkspaceFolderCapability) {
       this.connection.workspace.onDidChangeWorkspaceFolders((_event) => {
         this.connection.console.log('Workspace folder change event received.');
@@ -110,4 +120,31 @@ export class BitloopsServer {
       this.lspClient.publishDiagnostics({ uri: uri, diagnostics: diagnostic });
     }
   }
+
+  private async validateWorkspace(workspaceFolders: WorkspaceFolder[]) {
+    for (const workspaceFolder of workspaceFolders) {
+      const workspaceRoot = path.resolve(workspaceFolder.uri.replace('file://', ''));
+      const files = fs.readdirSync(workspaceRoot);
+      await this.validateBitloopsFiles(workspaceRoot);
+    }
+  }
+
+  private async validateBitloopsFiles(startPath) {
+    var files = fs.readdirSync(startPath);
+    for (var i = 0; i < files.length; i++) {
+      var filename = path.join(startPath, files[i]);
+      var stat = fs.lstatSync(filename);
+      if (stat.isDirectory()) {
+        this.validateBitloopsFiles(filename);
+      } else if (filename.endsWith('.bl')) {
+        const textDocument = TextDocument.create(
+          'file://' + filename,
+          'bitloops',
+          1,
+          fs.readFileSync(filename, 'utf8'),
+        );
+        await this.createDiagnostics(textDocument);
+      }
+    }
+  }
 }

server/yarn.lock

@@ -39,6 +39,11 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
+fs@^0.0.1-security:
+  version "0.0.1-security"
+  resolved "https://registry.yarnpkg.com/fs/-/fs-0.0.1-security.tgz#8a7bd37186b6dddf3813f23858b57ecaaf5e41d4"
+  integrity sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w==
+
 glob@^7.1.3:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
@@ -64,6 +69,11 @@ inherits@2:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
+
 lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
@@ -88,11 +98,24 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
+path@^0.12.7:
+  version "0.12.7"
+  resolved "https://registry.yarnpkg.com/path/-/path-0.12.7.tgz#d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f"
+  integrity sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==
+  dependencies:
+    process "^0.11.1"
+    util "^0.10.3"
+
 prettier@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
   integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
 
+process@^0.11.1:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
+
 rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
@@ -105,6 +128,13 @@ typescript@^4.8.4:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
   integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
 
+util@^0.10.3:
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+  integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
+  dependencies:
+    inherits "2.0.3"
+
 vscode-jsonrpc@6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz#108bdb09b4400705176b957ceca9e0880e9b6d4e"