more bug fixes, tests for every rule

Author: mug1wara26

esbuild.js

@@ -1,13 +1,34 @@
 const esbuild = require("esbuild");
+const glob = require("glob");
 
-esbuild.build({
-  entryPoints: ["server/src/server.ts"],  // Adjust if your main entry file is different
-  bundle: true,
-  platform: "node",
-  format: "cjs",  // Ensure CommonJS format
-  outfile: "./dist/source-lsp.js",
-  external: ["vscode"],  // Avoid bundling VSCode module
-  sourcemap: true,  // Optional: Generates a source map for debugging
-}).catch(() => process.exit(1));
-
-console.log("Built successfully")
+const testFiles = glob.sync("server/src/test/*.ts");
+
+async function build() {
+  esbuild.build({
+    entryPoints: ["server/src/server.ts"],
+    bundle: true,
+    platform: "node",
+    format: "cjs",
+    outfile: "./dist/source-lsp.js",
+    external: ["vscode"],  // Avoid bundling VSCode module
+    sourcemap: true,
+  });
+
+  if (testFiles.length > 0) {
+    await esbuild.build({
+      entryPoints: testFiles,
+      bundle: true,
+      platform: "node",
+      format: "cjs",
+      outdir: "./dist/tests",
+      external: ["vscode"],
+      sourcemap: true,
+    });
+  } else {
+    console.log("No test files found.");
+  }
+
+  console.log("Build complete.");
+}
+
+build().catch(() => process.exit(1))

package.json

@@ -64,7 +64,7 @@
     "watch": "tsc -b -w",
     "lint": "eslint",
     "postinstall": "cd client && npm install && cd ../server && npm install && cd ..",
-    "test": "node node_modules/mocha/bin/mocha.js server/out/test/*.js --ui tdd"
+    "test": "node node_modules/mocha/bin/mocha.js dist/tests/*.js --ui tdd"
   },
   "devDependencies": {
     "@eslint/js": "^9.13.0",

server/src/ast.ts

@@ -54,7 +54,7 @@ export class AST {
     catch (e) {
       this.ast = looseParse(text, acornOptions) as Node
     }
-    console.debug(JSON.stringify(this.ast, null, 2));
+    // console.debug(JSON.stringify(this.ast, null, 2));
 
     this.context = context;
     this.uri = uri;
@@ -77,8 +77,8 @@ export class AST {
 
     this.declarations.forEach(declarationList => {
       for (let i = 0; i < declarationList.length; i++) {
-        const declaration = declarationList[i]
-        if (declaration.unused)
+        const declaration = declarationList[i];
+        if (declaration.unused && declaration.name !== "✖")
           this.addDiagnostic("Unused name", DiagnosticSeverity.Warning, rangeToSourceLoc(declaration.selectionRange), [DiagnosticTag.Unnecessary]);
       }
     })
@@ -259,6 +259,10 @@ export class AST {
           name = param.name
         else if (param.type === NODES.REST && param.argument.type === NODES.IDENTIFIER)
           name = param.argument.name
+        else {
+          this.addDiagnostic("Unexpected token", DiagnosticSeverity.Error, param.loc!);
+          return;
+        }
         const param_declaration: DeclarationSymbol = {
           name: name,
           scope: child.body.loc!,

server/src/rules/breakStatement.ts

@@ -8,5 +8,6 @@ export const breakStatementRule = new class extends Rule<BreakStatement> {
     public process(child: BreakStatement, parent: Node, context: Context, ast: AST): void {
         if (context.chapter < Chapter.SOURCE_3) 
             ast.addDiagnostic("Break statements are not allowed", DiagnosticSeverity.Error, child.loc!)
+        // TODO: detect unsyntatic breaks (breaks outside of loops)
     }
 }();

server/src/rules/continueStatement.ts

@@ -8,5 +8,6 @@ export const continueStatementRule = new class extends Rule<ContinueStatement> {
     public process(child: ContinueStatement, parent: Node, context: Context, ast: AST): void {
         if (context.chapter < Chapter.SOURCE_3) 
             ast.addDiagnostic("Continue statements are not allowed", DiagnosticSeverity.Error, child.loc!)
+        // TODO: detect unsyntatic continues (continues outside of loops)
     }
 }();

server/src/rules/forStatement.ts

@@ -10,7 +10,7 @@ export const forStatementRule = new class extends Rule<ForStatement> {
     if (context.chapter < Chapter.SOURCE_3)
       ast.addDiagnostic("For statements are not allowed", DiagnosticSeverity.Error, { start: child.loc!.start, end: child.body.loc!.start })
     if (child.body.type !== STATEMENTS.BLOCK)
-      ast.addDiagnostic("Missing curly braces around for", DiagnosticSeverity.Error, child.loc!);
+      ast.addDiagnostic("Missing curly braces around for", DiagnosticSeverity.Error, { start: child.loc!.start, end: child.body.loc!.start });
     if (!(child.init && child.test && child.update))
       ast.addDiagnostic("Incomplete for loop", DiagnosticSeverity.Error, { start: child.loc!.start, end: child.body.loc!.start })
   }

server/src/rules/ifStatement.ts

@@ -8,10 +8,10 @@ import { Chapter, Context } from "../types";
 export const ifStatementRule = new class extends Rule<IfStatement> {
   public process(child: IfStatement, parent: Node, context: Context, ast: AST): void {
     if (context.chapter < Chapter.SOURCE_3 && !child.alternate)
-      ast.addDiagnostic(`Missing "else" in "if-else" statement`, DiagnosticSeverity.Error, child.consequent.loc!);
+      ast.addDiagnostic(`Missing "else" in "if-else" statement`, DiagnosticSeverity.Error, { start: child.loc!.start, end: child.consequent.loc!.start });
     if (child.consequent.type !== STATEMENTS.BLOCK)
-      ast.addDiagnostic("Missing curly braces around if", DiagnosticSeverity.Error, child.loc!);
+      ast.addDiagnostic("Missing curly braces around if", DiagnosticSeverity.Error, child.consequent.loc!);
     if (child.alternate && child.alternate.type !== STATEMENTS.BLOCK)
-      ast.addDiagnostic("Missing curly braces around else", DiagnosticSeverity.Error, child.loc!);
+      ast.addDiagnostic("Missing curly braces around else", DiagnosticSeverity.Error, child.alternate.loc!);
   }
 }();

server/src/rules/memberExpression.ts

@@ -7,11 +7,11 @@ import { Chapter, Context } from "../types";
 
 export const memberExpressionRule = new class extends Rule<MemberExpression> {
     public process(child: MemberExpression, parent: Node, context: Context, ast: AST): void {
-        if (context.chapter < Chapter.SOURCE_3) 
-            ast.addDiagnostic("Member access expressions are not allowed", DiagnosticSeverity.Error, child.loc!)
         // If computed is false, is dot abbreviation, else is object property / array access
         if (!child.computed)
             ast.addDiagnostic("No dot abbreviations", DiagnosticSeverity.Error, child.loc!);
+        else if (context.chapter < Chapter.SOURCE_3) 
+            ast.addDiagnostic("Member access expressions are not allowed", DiagnosticSeverity.Error, child.loc!)
         else if (child.property.type === NODES.IDENTIFIER && child.property.name === "undefined") 
             ast.addDiagnostic("Expected non negative integer as array index, got undefined.", DiagnosticSeverity.Error, child.property.loc!);
         else if (child.property.type === NODES.LITERAL) {

server/src/rules/returnStatement.ts

@@ -8,5 +8,6 @@ export const returnStatementRule = new class extends Rule<ReturnStatement> {
     public process(child: ReturnStatement, parent: Node, context: Context, ast: AST): void {
         if (!child.argument)
             ast.addDiagnostic("Missing value in return statement", DiagnosticSeverity.Error, child.loc!);
+        // TODO: detect unsyntatic returns (returns outside of functions)
     }
 }();

server/src/rules/whileStatement.ts

@@ -10,6 +10,6 @@ export const whileStatementRule = new class extends Rule<WhileStatement> {
         if (context.chapter < Chapter.SOURCE_3)
             ast.addDiagnostic("While statements are not allowed", DiagnosticSeverity.Error, { start: child.loc!.start, end: child.body.loc!.start })
         if (child.body.type !== STATEMENTS.BLOCK)
-            ast.addDiagnostic("Missing curly braces around while", DiagnosticSeverity.Error, child.loc!);
+            ast.addDiagnostic("Missing curly braces around while", DiagnosticSeverity.Error, { start: child.loc!.start, end: child.body.loc!.start });
     }
 }();