WIP

package.json

@@ -17,11 +17,11 @@
     "url": "https://github.com/NomicFoundation/hardhat-vscode/issues"
   },
   "scripts": {
-    "build": "tsc -b ./client/tsconfig.json && tsc -b ./server/tsconfig.build.json && tsc -b ./coc/tsconfig.json && tsc -b",
+    "build": "tsc -b ./client/tsconfig.json && tsc -b ./server/tsconfig.build.json && tsc -b ./coc/tsconfig.json",
     "watch": "concurrently -n client,server \"tsc -b -w ./client/tsconfig.json\" \"tsc -b -w ./server/tsconfig.build.json\"",
     "test:unit": "npm -w server run test",
     "test:protocol": "npm -w test/protocol run test",
-    "test:e2e": "npm run build && node ./out/test/runTests.js",
+    "test:e2e": "npm -w test/e2e run test",
     "test": "npm run test:unit && npm run test:protocol && npm run test:e2e",
     "test:coverage": "npm -w server run test:coverage",
     "test:codecov": "npm -w server run test:codecov",

server/src/compilerDiagnostics/diagnostics/MarkContractAbstract.ts

@@ -61,7 +61,7 @@ export class MarkContractAbstract {
     { document, uri }: ResolveActionsContext
   ): CodeAction | null {
     const contractToken = tokens.find(
-      (t) => "Keyword" && t.value === "contract"
+      (t) => t.type === "Keyword" && t.value === "contract"
     );
 
     if (contractToken === undefined || contractToken.range === undefined) {

server/tsconfig.json

@@ -12,6 +12,7 @@
     "declaration": true,
     "esModuleInterop": true,
     "resolveJsonModule": true,
+    "skipLibCheck": true,
     "paths": {
       "@compilerDiagnostics/*": ["./src/compilerDiagnostics/*"],
       "@analyzer/*": ["./src/parser/analyzer/*"],

test/e2e/.gitignore

@@ -0,0 +1 @@
+out

test/e2e/package.json

@@ -3,6 +3,8 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "postinstall": "cd ./projects/main && npm install"
+    "postinstall": "cd ./projects/main && npm install",
+    "pretest": "tsc -b .",
+    "test": "node ./out/runTests.js"
   }
 }

test/e2e/tests/commands/clean.test.ts

@@ -2,8 +2,8 @@ import assert from "assert";
 import { existsSync, mkdirSync } from "fs";
 import path from "path";
 import * as vscode from "vscode";
-import { waitForUI } from "../../helpers/editor";
-import { getRootPath } from "../../helpers/workspace";
+import { waitForUI } from "../helpers/editor";
+import { getRootPath } from "../helpers/workspace";
 
 suite("task - clean", function () {
   test("run clean task", async () => {

test/e2e/tests/commands/flatten.test.ts

@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import assert from "assert";
 import * as vscode from "vscode";
-import { getTestContractUri } from "../../helpers/getTestContract";
-import { openFileInEditor, waitForUI } from "../../helpers/editor";
+import { getTestContractUri } from "../helpers/getTestContract";
+import { openFileInEditor, waitForUI } from "../helpers/editor";
 
 suite("commands - flatten", function () {
   test("flatten via command palette", async () => {

test/e2e/tests/language-configuration/onEnterRules.test.ts

@@ -1,7 +1,7 @@
 import * as assert from "assert";
-import { joinLines } from "../../helpers/joinLines";
-import { CURSOR, withRandomFileEditor } from "../../helpers/editor";
-import { type } from "../../helpers/commands";
+import { joinLines } from "../helpers/joinLines";
+import { CURSOR, withRandomFileEditor } from "../helpers/editor";
+import { type } from "../helpers/commands";
 
 suite("onEnterRules", function () {
   test("[onEnterRules] - Multi line comment - first line with closing", async () => {

test/runTests.ts → test/e2e/tests/runTests.ts

@@ -9,14 +9,17 @@ import { runTests } from "@vscode/test-electron";
       __dirname,
       "..",
       "..",
+      "..",
       "client"
     );
 
     // The path to test runner
     // Passed to --extensionTestsPath
-    const extensionTestsPath = path.resolve(__dirname, "e2e", "index");
+    const extensionTestsPath = path.resolve(__dirname, "index");
+
+    const folder = path.resolve(__dirname, "..", "..", "..", "test", "e2e");
 
-    const folder = path.resolve(__dirname, "..", "..", "test", "e2e");
+    console.log("------------> folder", folder);
 
     // Download VS Code, unzip it and run the e2e test
     await runTests({

test/e2e/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
+    "module": "commonjs" /* Specify what module code is generated. */,
+    "resolveJsonModule": true /* Enable importing .json files. */,
+    "outDir": "./out" /* Specify an output folder for all emitted files. */,
+    "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
+    "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
+    "strict": true /* Enable all strict type-checking options. */,
+    "skipLibCheck": true /* Skip type checking all .d.ts files. */
+  },
+  "include": ["tests"]
+}