Merge branch 'features/support-eslint-config-vscode-ext'

alefragnani · Aug 7, 2020 · af346ec · af346ec
2 parents c1ddd1c + 4323bba
commit af346ec
Show file tree

Hide file tree

Showing 8 changed files with 884 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 ## [9.1.0] - 2020-08-05
 ### Internal
 - Support Extension View Context Menu (issue [#56](https://github.com/alefragnani/vscode-language-pascal/issues/56))
+- Migrate from TSLint to ESLint  (issue [#63](https://github.com/alefragnani/vscode-language-pascal/issues/63))
+
+### Fixed
+- Security Alert: elliptic (dependabot [PR #64](https://github.com/alefragnani/vscode-language-pascal/pull/64))
+- Security Alert: acorn (dependabot [PR #58](https://github.com/alefragnani/vscode-language-pascal/pull/58))
 
 ## [9.0.0] - 2020-02-14
 ### Changed

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
   <a title="Learn more about Pascal" href="http://github.com/alefragnani/vscode-language-pascal"><img src="https://raw.githubusercontent.com/alefragnani/vscode-language-pascal/master/images/vscode-pascal-logo-readme.png" alt="Pascal Logo" width="70%" /></a>
 </p>
 
-# What's new in Pascal 9
+# What's new in Pascal 9.1
 
 * Adds **Multi-root** support
 * Adds **Visual Studio Live Share** support 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -96,17 +96,17 @@
         "menus": {
             "commandPalette": [
                 {
-					"command": "_pascal.whatsNewContextMenu",
-					"when": "false"
-				}
+                    "command": "_pascal.whatsNewContextMenu",
+                    "when": "false"
+                }
             ],
-			"extension/context": [
-				{
-					"command": "_pascal.whatsNewContextMenu",
-					"group": "pascal",
-					"when": "extension == alefragnani.pascal && extensionStatus == installed"
-				}
-			]
+            "extension/context": [
+                {
+                    "command": "_pascal.whatsNewContextMenu",
+                    "group": "pascal",
+                    "when": "extension == alefragnani.pascal && extensionStatus == installed"
+                }
+            ]
         },
         "configuration": {
             "type": "object",
@@ -130,24 +130,34 @@
             }
         }
     },
+	"eslintConfig": {
+		"extends": [
+			"vscode-ext"
+		]
+	},
     "scripts": {
         "build": "webpack --mode development",
         "watch": "webpack --watch --mode development --info-verbosity verbose",
         "vscode:prepublish": "webpack --mode production",
         "webpack": "webpack --mode development",
         "webpack-dev": "webpack --mode development --watch",
-        "compile": "tsc -watch -p ./"
+        "compile": "tsc -watch -p ./",
+        "lint": "eslint -c .eslintrc.js --ext .ts src vscode-language-pascal-providers vscode-whats-new"
     },
     "extensionDependencies": [
         "alefragnani.pascal-formatter"
     ],
     "devDependencies": {
         "@types/node": "^6.0.40",
         "@types/vscode": "^1.41.0",
+        "@typescript-eslint/eslint-plugin": "^3.8.0",
+        "@typescript-eslint/parser": "^3.8.0",
+        "eslint": "^7.6.0",
+        "eslint-config-vscode-ext": "^1.0.0",
+        "terser-webpack-plugin": "^1.2.1",
+        "ts-loader": "^4.4.2",
         "typescript": "^3.1.6",
         "webpack": "^4.19.1",
-        "webpack-cli": "^3.1.0",
-        "ts-loader": "^4.4.2",
-        "terser-webpack-plugin": "^1.2.1"
+        "webpack-cli": "^3.1.0"
     }
 }
diff --git a/src/extension.ts b/src/extension.ts
@@ -29,11 +29,11 @@ export function activate(context: vscode.ExtensionContext) {
         if (value) {
             context.subscriptions.push(vscode.languages.registerDocumentSymbolProvider(documentSelector, new PascalDocumentSymbolProvider()));
 
-            const hasNoWorkspace: boolean = !vscode.workspace.workspaceFolders;
+            const hasNoWorkspace = !vscode.workspace.workspaceFolders;
             const isSingleWorkspace: boolean = vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length === 1;
             const isMultirootWorkspace: boolean = vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 1;
 
-            let canRegisterOtherProviders: boolean =    false;
+            let canRegisterOtherProviders =    false;
 
             if (hasNoWorkspace) {
                 canRegisterOtherProviders = false;
@@ -66,8 +66,8 @@ export function activate(context: vscode.ExtensionContext) {
             return;
         } 
 
-        let tagBuilder: TagsBuilder = new TagsBuilder();
-        let basePath: string = vscode.workspace.getWorkspaceFolder(vscode.window.activeTextEditor.document.uri).uri.fsPath;
+        const tagBuilder: TagsBuilder = new TagsBuilder();
+        const basePath: string = vscode.workspace.getWorkspaceFolder(vscode.window.activeTextEditor.document.uri).uri.fsPath;
         tagBuilder.generateTags(basePath, update, true);
     }
 

diff --git a/src/whats-new/commands.ts b/src/whats-new/commands.ts
@@ -9,8 +9,8 @@ import { WhatsNewManager } from "../../vscode-whats-new/src/Manager";
 import { WhatsNewPascalContentProvider } from "./contentProvider";
 
 export function registerWhatsNew() {
-    let provider = new WhatsNewPascalContentProvider();
-    let viewer = new WhatsNewManager(Container.context).registerContentProvider("pascal", provider);
+    const provider = new WhatsNewPascalContentProvider();
+    const viewer = new WhatsNewManager(Container.context).registerContentProvider("pascal", provider);
     viewer.showPageInActivation();
     Container.context.subscriptions.push(commands.registerCommand('pascal.whatsNew', () => viewer.showPage()));
     Container.context.subscriptions.push(commands.registerCommand('_pascal.whatsNewContextMenu', () => viewer.showPage()));

diff --git a/src/whats-new/contentProvider.ts b/src/whats-new/contentProvider.ts
@@ -15,7 +15,7 @@ export class WhatsNewPascalContentProvider implements ContentProvider {
     }
 
     provideChangeLog(): ChangeLogItem[] {
-        let changeLog: ChangeLogItem[] = [];
+        const changeLog: ChangeLogItem[] = [];
 
         changeLog.push({ kind: ChangeLogKind.VERSION, detail: { releaseNumber: "9.1.0", releaseDate: "August 2020" } });
         changeLog.push({
@@ -26,6 +26,32 @@ export class WhatsNewPascalContentProvider implements ContentProvider {
                 kind: IssueKind.Issue
             }
         });
+        changeLog.push({
+            kind: ChangeLogKind.INTERNAL,
+            detail: {
+                message: "Migrate from TSLint to ESLint",
+                id: 63,
+                kind: IssueKind.Issue
+            }
+        });
+        changeLog.push({
+            kind: ChangeLogKind.FIXED,
+            detail: {
+                message: "Security Alert: elliptic",
+                id: 64,
+                kind: IssueKind.PR,
+                kudos: "dependabot"
+            }
+        });
+        changeLog.push({
+            kind: ChangeLogKind.FIXED,
+            detail: {
+                message: "Security Alert: acorn",
+                id: 58,
+                kind: IssueKind.PR,
+                kudos: "dependabot"
+            }
+        });
 
         changeLog.push({ kind: ChangeLogKind.VERSION, detail: { releaseNumber: "9.0.0", releaseDate: "February 2020" } });
         changeLog.push({
@@ -96,7 +122,7 @@ export class WhatsNewPascalContentProvider implements ContentProvider {
     }
 
     provideSponsors(): Sponsor[] {
-        let sponsors: Sponsor[] = [];
+        const sponsors: Sponsor[] = [];
         return sponsors
     }
 

diff --git a/vscode-language-pascal-providers b/vscode-language-pascal-providers