Fix security warnings (#39)

Author: pokey

.eslintrc.json

@@ -0,0 +1,47 @@
+{
+	"root": true,
+	"parser": "@typescript-eslint/parser",
+	"extends": [
+		"eslint:recommended",
+		"plugin:@typescript-eslint/recommended",
+		"prettier"
+	],
+	"parserOptions": {
+		"ecmaVersion": 6,
+		"sourceType": "module"
+	},
+	"plugins": ["@typescript-eslint"],
+	"rules": {
+		"@typescript-eslint/consistent-type-assertions": [
+			"error",
+			{
+				"assertionStyle": "as"
+			}
+		],
+		"@typescript-eslint/naming-convention": "warn",
+		"@typescript-eslint/no-explicit-any": "off",
+		"@typescript-eslint/no-inferrable-types": "off",
+		"@typescript-eslint/no-non-null-assertion": "off",
+		"@typescript-eslint/no-unused-vars": [
+			"warn",
+			{
+				"argsIgnorePattern": "^_",
+				"varsIgnorePattern": "^_",
+				"ignoreRestSiblings": true
+			}
+		],
+		"curly": "warn",
+		"eqeqeq": [
+			"warn",
+			"always",
+			{
+				"null": "never"
+			}
+		],
+		"no-constant-condition": ["error", { "checkLoops": false }],
+		"no-throw-literal": "warn",
+		"semi": "off"
+	},
+	"ignorePatterns": ["**/vendor/**/*.ts", "**/vendor/**/*.js"]
+}
+

package.json

@@ -14,7 +14,7 @@
 		"ui"
 	],
 	"engines": {
-		"vscode": "^1.34.0"
+		"vscode": "^1.58.0"
 	},
 	"categories": [
 		"Programming Languages",
@@ -65,16 +65,20 @@
 		"compile": "tsc -p ./ && make parsers",
 		"watch": "tsc -watch -p ./",
 		"preinstall": "make web-tree-sitter",
-		"postinstall": "node ./node_modules/vscode/bin/install",
 		"test": "npm run compile && node ./out/test",
 		"benchmark": "npm run compile && node ./out/benchmark",
 		"debug": "npm run compile && node --nolazy --inspect-brk=9229 ./out/test",
+		"lint": "eslint src --ext ts",
 		"build": "vsce package -o build.vsix",
 		"publish": "vsce publish patch"
 	},
 	"devDependencies": {
 		"@types/mocha": "^2.2.42",
 		"@types/node": "^8.10.25",
+		"@typescript-eslint/eslint-plugin": "^5.20.0",
+		"@typescript-eslint/parser": "^5.20.0",
+		"eslint": "^8.13.0",
+		"eslint-config-prettier": "^8.5.0",
 		"electron-rebuild": "^2.3.5",
 		"tree-sitter-agda": "github:pokey/tree-sitter-agda#e5fba6cabe8c7fc7993ced2b86704f3841215284",
 		"tree-sitter-bash": "^0.19.0",
@@ -104,9 +108,9 @@
 		"tree-sitter-typescript": "github:tree-sitter/tree-sitter-typescript#master",
 		"tree-sitter-yaml": "^0.5.0",
 		"tslint": "^6.0.0",
-		"typescript": "^3.8.2",
-		"vsce": "^1.73.0",
-		"vscode": "^1.1.36"
+		"typescript": "^4.5.5",
+		"@types/vscode": "~1.58.0",
+		"@vscode/test-electron": "^2.1.3"
 	},
 	"dependencies": {
 		"jsonc-parser": "^2.1.0",

src/extension.ts

@@ -60,8 +60,12 @@ export async function activate(context: vscode.ExtensionContext) {
    */
   async function loadLanguage(languageId: string) {
     const language = languages[languageId];
-    if (language == null) return false;
-    if (language.parser != null) return true;
+    if (language == null) {
+      return false;
+    }
+    if (language.parser != null) {
+      return true;
+    }
 
     const absolute = path.join(
       context.extensionPath,
@@ -79,9 +83,13 @@ export async function activate(context: vscode.ExtensionContext) {
 
   async function open(document: vscode.TextDocument) {
     const uriString = document.uri.toString();
-    if (uriString in trees) return;
+    if (uriString in trees) {
+      return;
+    }
 
-    if (!(await loadLanguage(document.languageId))) return;
+    if (!(await loadLanguage(document.languageId))) {
+      return;
+    }
 
     const language = languages[document.languageId];
     const t = language.parser!.parse(document.getText()); // TODO don't use getText, use Parser.Input
@@ -90,11 +98,17 @@ export async function activate(context: vscode.ExtensionContext) {
 
   function openIfLanguageLoaded(document: vscode.TextDocument) {
     const uriString = document.uri.toString();
-    if (uriString in trees) return null;
+    if (uriString in trees) {
+      return null;
+    }
 
     const language = languages[document.languageId];
-    if (language == null) return null;
-    if (language.parser == null) return null;
+    if (language == null) {
+      return null;
+    }
+    if (language.parser == null) {
+      return null;
+    }
 
     const t = language.parser.parse(document.getText()); // TODO don't use getText, use Parser.Input
     trees[uriString] = t;
@@ -104,12 +118,16 @@ export async function activate(context: vscode.ExtensionContext) {
   // NOTE: if you make this an async function, it seems to cause edit anomalies
   function edit(edit: vscode.TextDocumentChangeEvent) {
     const language = languages[edit.document.languageId];
-    if (language == null || language.parser == null) return;
+    if (language == null || language.parser == null) {
+      return;
+    }
     updateTree(language.parser, edit);
   }
 
   function updateTree(parser: Parser, edit: vscode.TextDocumentChangeEvent) {
-    if (edit.contentChanges.length == 0) return;
+    if (edit.contentChanges.length === 0) {
+      return;
+    }
     const old = trees[edit.document.uri.toString()];
     for (const e of edit.contentChanges) {
       const startIndex = e.rangeOffset;
@@ -219,4 +237,6 @@ export async function activate(context: vscode.ExtensionContext) {
 }
 
 // this method is called when your extension is deactivated
-export function deactivate() {}
+export function deactivate() {
+  // Empty
+}

src/scopes.ts

@@ -27,7 +27,7 @@ export async function load() {
     colors.clear()
     // Find out current color theme
     const themeName = vscode.workspace.getConfiguration("workbench").get("colorTheme")
-    if (typeof themeName != 'string') {
+    if (typeof themeName !== 'string') {
         console.warn('workbench.colorTheme is', themeName)
         return
     }
@@ -52,7 +52,7 @@ async function loadThemeNamed(themeName: string) {
         if (packageJson.contributes && packageJson.contributes.themes) {
             for (const theme of packageJson.contributes.themes) {
                 const id = theme.id || theme.label
-                if (id == themeName) {
+                if (id === themeName) {
                     const themeRelativePath: string = theme.path
                     const themeFullPath: string = path.join(extensionPath, themeRelativePath)
                     await loadThemeFile(themeFullPath)
@@ -79,7 +79,7 @@ async function loadThemeFile(themePath: string) {
 
 function loadColors(textMateRules: TextMateRule[]): void {
     for (const rule of textMateRules) {
-        if (typeof rule.scope == 'string') {
+        if (typeof rule.scope === 'string') {
             if (!colors.has(rule.scope)) {
                 colors.set(rule.scope, rule.settings)
             }
@@ -94,7 +94,7 @@ function loadColors(textMateRules: TextMateRule[]): void {
 }
 
 function checkFileExists(filePath: string): Promise<boolean> {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve, _reject) => {
         fs.stat(filePath, (err, stats) => {
             if (stats && stats.isFile()) {
                 resolve(true)

tsconfig.json

@@ -4,14 +4,12 @@
 		"target": "es6",
 		"outDir": "out",
 		"lib": [
-			"es6"
+			"es2020"
 		],
 		"sourceMap": true,
 		"rootDir": "src",
-		/* Strict Type-Checking Option */
-		"strict": true,   /* enable all strict type-checking options */
+		"strict": true /* enable all strict type-checking options */
 		/* Additional Checks */
-		"noUnusedLocals": true /* Report errors on unused locals. */
 		// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
 		// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
 		// "noUnusedParameters": true,  /* Report errors on unused parameters. */
@@ -23,4 +21,4 @@
 		"node_modules",
 		"vendor"
 	]
-}
+}