Merge pull request #30 from bitloops/develop

Author: giorgosnty

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.4.5
+
+Updated version of bitloops-transpiler, no hover if there are syntactic errors.
+
 ### 0.4.4
 
 Fixed bug of hover.

README.md

@@ -33,9 +33,9 @@ No known issues.
 
 ## What's New
 
-### 0.4.4
+### 0.4.5
 
-Fixed bug of hover.
+Updated version of bitloops-transpiler, no hover if there are syntactic errors.
 
 ---
 

package.json

@@ -9,7 +9,7 @@
   },
   "icon": "assets/images/bitloops-language-logo-256x256.png",
   "license": "MIT",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "scripts": {
     "vs:package": "vsce package",
     "vs:publish": "vsce publish",

server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bitloops-lsp-server",
   "description": "BitLoops Language Server",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "publisher": "Bitloops",
   "license": "MIT",
   "engines": {
@@ -10,7 +10,7 @@
   "type": "module",
   "scripts": {},
   "dependencies": {
-    "@bitloops/bl-transpiler": "^0.6.11",
+    "@bitloops/bl-transpiler": "^0.7.0",
     "debounce": "^1.2.1",
     "fs": "^0.0.1-security",
     "path": "^0.12.7",

server/src/lsp/handlers/document-text-changed-handler/bitloops-transpiler-analyzer.ts

@@ -16,7 +16,7 @@ import { TFileId } from '../../../types.js';
 import { StateManager, TFileDiagnostics } from '../../services/StateManager.js';
 
 export class BitloopsAnalyzer implements IAnalyzer {
-  symbolTable: ParserSyntacticErrors | TSymbolTableSemantics;
+  symbolTable: TSymbolTableSemantics | null;
   constructor(private stateManager: StateManager) {}
 
   analyze(): TFileDiagnostics {
@@ -35,13 +35,14 @@ export class BitloopsAnalyzer implements IAnalyzer {
       //   'Info:',
       //   transpilerInput.core.map((x) => ({ bc: x.boundedContext, mod: x.module })),
       // );
-      this.symbolTable = transpiler.getSymbolTable(transpilerInput);
+      this.symbolTable = transpiler.getSymbolTable(transpilerInput) as TSymbolTableSemantics;
 
       const intermediateModelOrErrors = transpiler.bitloopsCodeToIntermediateModel(transpilerInput);
       if (Transpiler.isTranspilerError(intermediateModelOrErrors)) {
         this.mapTranspilerErrorsToLSPDiagnostics(intermediateModelOrErrors);
         return this.stateManager.getDiagnostics();
       }
+
       console.log('Workspace analysis completed without errors');
       return this.stateManager.getDiagnostics();
     } catch (e) {
@@ -52,6 +53,7 @@ export class BitloopsAnalyzer implements IAnalyzer {
 
   private mapTranspilerErrorsToLSPDiagnostics(transpilerErrors: TranspilerErrors): void {
     if (isParserErrors(transpilerErrors)) {
+      this.symbolTable = null; //symbolTable is not available if there are parser errors
       this.mapParserErrorsToLSPDiagnostics(transpilerErrors);
       return;
     }
@@ -128,7 +130,10 @@ export class BitloopsAnalyzer implements IAnalyzer {
       ]);
     }
   }
-  public getSymbolTable(): ParserSyntacticErrors | TSymbolTableSemantics {
+  public getSymbolTable(): TSymbolTableSemantics | null {
+    if (!this.symbolTable) {
+      return null;
+    }
     return this.symbolTable;
   }
 }

server/src/lsp/handlers/document-text-changed-handler/interface.ts

@@ -6,5 +6,5 @@ export interface IAnalyzer {
    * It analyzes the document and returns a list of diagnostics.
    */
   analyze(): TFileDiagnostics;
-  getSymbolTable(): ParserSyntacticErrors | TSymbolTableSemantics;
+  getSymbolTable(): TSymbolTableSemantics | null;
 }

server/src/lsp/handlers/hover-handler/hover.ts

@@ -15,7 +15,7 @@ export const handleHover = (
   const boundedContext = stateManager.getBoundedContext(params.textDocument.uri);
   if (boundedContext === 'unknown') return null; //if the bounded context is unknown, we don't want to have hover provider
   let word = findWord(document, position);
-  const symbolTable = analyzer.getSymbolTable() as TSymbolTableSemantics;
+  const symbolTable = analyzer.getSymbolTable();
   if (!symbolTable) return null;
   const testSymbolTable = symbolTable.symbolTables[boundedContext];
   const typeOfKeyword = testSymbolTable?.findTypeOfKeyword(word, {

server/yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@bitloops/bl-transpiler@^0.6.11":
-  version "0.6.11"
-  resolved "https://registry.yarnpkg.com/@bitloops/bl-transpiler/-/bl-transpiler-0.6.11.tgz#6be3bf6bab6a7915539708a8b18c05d573417227"
-  integrity sha512-rE39fr4cupvIrkefxY3G0aZQ6eugZK0DXSLL8BOc6vHXNemCJ1Hi1+eDUqurlcv4Wh+AfzCjlaT6F/Xg0M/U2A==
+"@bitloops/bl-transpiler@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@bitloops/bl-transpiler/-/bl-transpiler-0.7.0.tgz#cc63bae8781d8addc830cd266720fa3205c8bdb6"
+  integrity sha512-9584ZgekEZuOwVF/on/ooGsG1IoLptQk6vuY2uQGGKfknCnE/zY8bITL9PKO2M90RaDQn97vwDqQiYLQD/3AAg==
   dependencies:
     antlr4 "4.11.0"
     lodash "^4.17.21"