Fix parser

Author: Varagos

server/.prettierrc

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

server/package.json

@@ -5,19 +5,22 @@
   "publisher": "Bitloops",
   "license": "MIT",
   "engines": {
-    "node": "*"
+    "node": ">= 13"
+  },
+  "type": "module",
+  "scripts": {
+    "generate-core-dts": "rimraf src/parser/core/grammar/Bitloops*.ts && node --experimental-vm-modules node_modules/typescript/bin/tsc src/parser/core/grammar/Bitloops*js --declaration --emitDeclarationOnly --allowJs --outDir src/parser/core/grammar && node_modules/prettier/bin-prettier.js --config .prettierrc --write src/parser/core/grammar/*.d.ts",
+    "ant": "yarn antlr4 -listener -visitor -Dlanguage=JavaScript src/parser/grammar/BitloopsLexer.g4 && yarn antlr4 -listener -visitor -Dlanguage=JavaScript src/parser/grammar/BitloopsParser.g4 && yarn generate-core-dts",
+    "antlr4": "java -jar /usr/local/lib/antlr-4.10.1-complete.jar"
   },
   "dependencies": {
     "antlr4": "^4.11.0",
     "vscode-languageserver": "^7.0.0",
     "vscode-languageserver-textdocument": "^1.0.4"
   },
-  "scripts": {
-    "generate-core-dts": "rimraf src/parser/grammar/Bitloops*.ts && node --experimental-vm-modules node_modules/typescript/bin/tsc src/parser/grammar/Bitloops*js --declaration --emitDeclarationOnly --allowJs --outDir src/parser/grammar",
-    "ant": "java -jar /usr/local/lib/antlr-4.10.1-complete.jar -listener -visitor -Dlanguage=JavaScript src/parser/grammar/BitloopsLexer.g4 && java -jar /usr/local/lib/antlr-4.10.1-complete.jar -listener -visitor -Dlanguage=JavaScript src/parser/grammar/BitloopsParser.g4 && yarn generate-core-dts"
-  },
   "devDependencies": {
     "@types/antlr4": "^4.11.0",
+    "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
     "typescript": "^4.8.4"
   }

server/src/analyzer.ts

@@ -1,9 +1,9 @@
 import { Diagnostic } from 'vscode-languageserver';
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import { DiagnosticFactory } from './diagnostic';
-import { EErrors } from './types/Errors';
-import { components } from './types/keywords';
-import { getMatchRange } from './utils/regex';
+import { DiagnosticFactory } from './diagnostic.js';
+import { EErrors } from './types/Errors.js';
+import { components } from './types/keywords.js';
+import { getMatchRange } from './utils/regex.js';
 
 export interface IAnalyzer {
   analyze(document: TextDocument): Diagnostic[];

server/src/completion.ts

@@ -1,13 +1,7 @@
-import {
-  CompletionItem,
-  CompletionItemKind,
-  Connection,
-  TextDocumentPositionParams,
-} from 'vscode-languageserver/node';
-import { BitloopsServer } from './server';
-import { documentation } from './information/documentation';
-import { details } from './information/details';
-import { components } from './types/keywords';
+import { CompletionItem, CompletionItemKind, TextDocumentPositionParams } from 'vscode-languageserver/node.js';
+import { documentation } from './information/documentation.js';
+import { details } from './information/details.js';
+import { components } from './types/keywords.js';
 
 export class BitloopsCompletionItemProvider {
   // constructor(connection: Connection) {

server/src/diagnostic.ts

@@ -1,4 +1,4 @@
-import { Diagnostic, DiagnosticSeverity, Range, TextDocument } from 'vscode-languageserver/node';
+import { Diagnostic, DiagnosticSeverity, Range, TextDocument } from 'vscode-languageserver/node.js';
 
 export class DiagnosticFactory {
   public static create(

server/src/index.ts

@@ -5,8 +5,8 @@ import {
   InitializeResult,
   ProposedFeatures,
   TextDocumentSyncKind,
-} from 'vscode-languageserver/node';
-import { BitloopsServer } from './server';
+} from 'vscode-languageserver/node.js';
+import { BitloopsServer } from './server.js';
 let hasConfigurationCapability = false;
 let hasWorkspaceFolderCapability = false;
 let hasDiagnosticRelatedInformationCapability = false;

server/src/linter.ts

@@ -1,21 +1,24 @@
 import { Connection } from 'vscode-languageserver';
-import { getDocumentSettings } from './setings';
+import { getDocumentSettings } from './setings.js';
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import { IAnalyzer, RegexAnalyzer } from './analyzer';
-import { AntlrAnalyzer } from './parser/index';
+import { IAnalyzer, RegexAnalyzer } from './analyzer.js';
+import { AntlrAnalyzer } from './parser/index.js';
 
-const analyzer: IAnalyzer = new RegexAnalyzer();
+const analyzer: IAnalyzer = new AntlrAnalyzer();
 let problems = 0;
 export async function lint(
   textDocument: TextDocument,
   hasConfigurationCapability: boolean,
   hasDiagnosticRelatedInformationCapability: boolean,
-  connection: Connection
+  connection: Connection,
 ): Promise<void> {
   // In this simple example we get the settings for every validate run.
-  const settings = await getDocumentSettings(textDocument.uri, hasConfigurationCapability, connection);
+  const settings = await getDocumentSettings(
+    textDocument.uri,
+    hasConfigurationCapability,
+    connection,
+  );
 
-  const analyzerAntlr: IAnalyzer = new AntlrAnalyzer();
   console.debug('visited analyzer');
   // const pattern = /\b[A-Z]{2,}\b/g;
   let diagnostics = analyzer.analyze(textDocument);