Merge branch 'master' of github.com:KreativJos/csharpextensions

KreativJos · Jul 29, 2021 · ba1cad6 · ba1cad6
2 parents 47d429f + 5595e6e
commit ba1cad6
Show file tree

Hide file tree

Showing 11 changed files with 497 additions and 439 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,44 @@
+{
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended"
+    ],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": 12,
+        "sourceType": "module"
+    },
+    "plugins": [
+        "@typescript-eslint"
+    ],
+    "rules": {
+        "indent": [
+            "error",
+            4
+        ],
+        "linebreak-style": [
+            "error",
+            "windows"
+        ],
+        "quotes": [
+            "error",
+            "single"
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+        "eqeqeq": "warn",
+        "newline-before-return": "error",
+        "no-empty": [
+            "error",
+            {
+                "allowEmptyCatch": true
+            }
+        ]
+    }
+}
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,17 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
diff --git a/find-up-glob.d.ts b/find-up-glob.d.ts
@@ -0,0 +1 @@
+declare module 'find-up-glob';
diff --git a/package.json b/package.json
@@ -115,13 +115,14 @@
         "test": "node ./out/test/runTest.js"
     },
     "devDependencies": {
-        "@types/vscode": "^1.56.0",
         "@types/glob": "^7.1.3",
         "@types/mocha": "^8.0.4",
         "@types/node": "^12.11.7",
+        "@types/vscode": "^1.56.0",
+        "@types/xml2js": "^0.4.9",
+        "@typescript-eslint/eslint-plugin": "^4.28.5",
+        "@typescript-eslint/parser": "^4.28.5",
         "eslint": "^7.19.0",
-        "@typescript-eslint/eslint-plugin": "^4.14.1",
-        "@typescript-eslint/parser": "^4.14.1",
         "glob": "^7.1.6",
         "mocha": "^8.2.1",
         "typescript": "^4.1.3",
@@ -131,4 +132,4 @@
         "find-up-glob": "^1.0.0",
         "xml2js": "^0.4.23"
     }
-}
+}
diff --git a/src/codeActionProvider.ts b/src/codeActionProvider.ts
@@ -19,12 +19,12 @@ export default class CodeActionProvider implements vscode.CodeActionProvider {
     }
 
     public provideCodeActions(document: vscode.TextDocument, range: vscode.Range, context: vscode.CodeActionContext, token: vscode.CancellationToken): vscode.Command[] {
-        let commands = new Array<vscode.Command>();
+        const commands = new Array<vscode.Command>();
 
         const addInitalizeFromCtor = (type: MemberGenerationType) => {
             const cmd = this.getInitializeFromCtorCommand(document, range, context, token, type);
 
-            if (cmd) commands.push(cmd)
+            if (cmd) commands.push(cmd);
         };
 
         addInitalizeFromCtor(MemberGenerationType.PrivateField);
@@ -40,57 +40,58 @@ export default class CodeActionProvider implements vscode.CodeActionProvider {
 
     private camelize(str: string) {
         return str.replace(/(?:^\w|[A-Z]|\b\w|\s+)/g, function (match, index) {
-            if (+match === 0) return ""; // or if (/\s+/.test(match)) for white spaces
-            return index == 0 ? match.toLowerCase() : match.toUpperCase();
+            if (+match === 0) return ''; // or if (/\s+/.test(match)) for white spaces
+
+            return index === 0 ? match.toLowerCase() : match.toUpperCase();
         });
     }
 
     private async executeCtorFromProperties(args: ConstructorFromPropertiesArgument) {
         const tabSize = vscode.workspace.getConfiguration().get('editor.tabSize', 4);
-        let ctorParams = new Array<string>();
+        const ctorParams = new Array<string>();
 
         if (!args.properties)
             return;
 
         args.properties.forEach((p) => {
-            ctorParams.push(`${p.type} ${this.camelize(p.name)}`)
+            ctorParams.push(`${p.type} ${this.camelize(p.name)}`);
         });
 
-        let assignments = args.properties
+        const assignments = args.properties
             .map(prop => `${Array(tabSize * 1).join(' ')} this.${prop.name} = ${this.camelize(prop.name)};${os.EOL}`);
 
-        let firstPropertyLine = args.properties.sort((a, b) => a.lineNumber - b.lineNumber)[0].lineNumber;
+        const firstPropertyLine = args.properties.sort((a, b) => a.lineNumber - b.lineNumber)[0].lineNumber;
 
         const ctorStatement = `${Array(tabSize * 2).join(' ')} ${args.classDefinition.modifier} ${args.classDefinition.className}(${ctorParams.join(', ')}) 
         {
         ${assignments.join('')}   
         }
         `;
 
-        let edit = new vscode.WorkspaceEdit();
-        let edits = new Array<vscode.TextEdit>();
+        const edit = new vscode.WorkspaceEdit();
+        const edits = new Array<vscode.TextEdit>();
 
         const pos = new vscode.Position(firstPropertyLine, 0);
         const range = new vscode.Range(pos, pos);
         const ctorEdit = new vscode.TextEdit(range, ctorStatement);
 
-        edits.push(ctorEdit)
-        
+        edits.push(ctorEdit);
+
         await this.formatDocument(args.document.uri, edit, edits);
     }
 
     private async formatDocument(documentUri: vscode.Uri, edit: vscode.WorkspaceEdit, edits: Array<vscode.TextEdit>) {
         edit.set(documentUri, edits);
 
-        let reFormatAfterChange = vscode.workspace.getConfiguration().get('csharpextensions.reFormatAfterChange', true);
-        
+        const reFormatAfterChange = vscode.workspace.getConfiguration().get('csharpextensions.reFormatAfterChange', true);
+
         await vscode.workspace.applyEdit(edit);
 
         if (reFormatAfterChange) {
             const formattingEdits = await vscode.commands.executeCommand<vscode.TextEdit[]>('vscode.executeFormatDocumentProvider', documentUri);
 
             if (formattingEdits !== undefined) {
-                let formatEdit = new vscode.WorkspaceEdit();
+                const formatEdit = new vscode.WorkspaceEdit();
 
                 formatEdit.set(documentUri, formattingEdits);
 
@@ -102,14 +103,14 @@ export default class CodeActionProvider implements vscode.CodeActionProvider {
     private getCtorpCommand(document: vscode.TextDocument, range: vscode.Range, context: vscode.CodeActionContext, token: vscode.CancellationToken): vscode.Command | null {
         const editor = vscode.window.activeTextEditor;
 
-        if (editor == null) return null;
+        if (!editor) return null;
 
         const position = editor.selection.active;
         const withinClass = this.findClassFromLine(document, position.line);
 
-        if (withinClass == null || !withinClass) return null;
+        if (!withinClass) return null;
 
-        let properties = new Array<CSharpPropertyDefinition>();
+        const properties = new Array<CSharpPropertyDefinition>();
         let lineNo = 0;
 
         while (lineNo < document.lineCount) {
@@ -119,15 +120,15 @@ export default class CodeActionProvider implements vscode.CodeActionProvider {
             if (match) {
                 const foundClass = this.findClassFromLine(document, lineNo);
 
-                if (foundClass != null && foundClass.className === withinClass.className) {
+                if (foundClass && foundClass.className === withinClass.className) {
                     const prop: CSharpPropertyDefinition = {
                         lineNumber: lineNo,
                         class: foundClass,
                         modifier: match[1],
                         type: match[2],
                         name: match[3],
                         statement: match[0]
-                    }
+                    };
 
                     properties.push(prop);
                 }
@@ -149,7 +150,7 @@ export default class CodeActionProvider implements vscode.CodeActionProvider {
         };
 
         const cmd: vscode.Command = {
-            title: "Initialize ctor from properties...",
+            title: 'Initialize ctor from properties...',
             command: this._commandIds.ctorFromProperties,
             arguments: [parameter]
         };
@@ -162,7 +163,7 @@ export default class CodeActionProvider implements vscode.CodeActionProvider {
             const line = document.lineAt(lineNo);
             const match = this._classRegex.exec(line.text);
 
-            if (match != null && match) {
+            if (match) {
                 return {
                     startLine: lineNo,
                     endLine: -1,
@@ -179,20 +180,20 @@ export default class CodeActionProvider implements vscode.CodeActionProvider {
     }
 
     private async initializeMemberFromCtor(args: InitializeFieldFromConstructor) {
-        let edit = new vscode.WorkspaceEdit();
+        const edit = new vscode.WorkspaceEdit();
 
-        const bodyStartRange = new vscode.Range(args.constructorBodyStart, args.constructorBodyStart)
+        const bodyStartRange = new vscode.Range(args.constructorBodyStart, args.constructorBodyStart);
         const declarationRange = new vscode.Range(args.constructorStart, args.constructorStart);
 
-        let declarationEdit = new vscode.TextEdit(declarationRange, args.memberGeneration.declaration);
-        let memberInitEdit = new vscode.TextEdit(bodyStartRange, args.memberGeneration.assignment);
+        const declarationEdit = new vscode.TextEdit(declarationRange, args.memberGeneration.declaration);
+        const memberInitEdit = new vscode.TextEdit(bodyStartRange, args.memberGeneration.assignment);
 
-        let edits = new Array<vscode.TextEdit>();
+        const edits = new Array<vscode.TextEdit>();
 
-        if (args.document.getText().indexOf(args.memberGeneration.declaration.trim()) == -1)
+        if (args.document.getText().indexOf(args.memberGeneration.declaration.trim()) === -1)
             edits.push(declarationEdit);
 
-        if (args.document.getText().indexOf(args.memberGeneration.assignment.trim()) == -1)
+        if (args.document.getText().indexOf(args.memberGeneration.assignment.trim()) === -1)
             edits.push(memberInitEdit);
 
         await this.formatDocument(args.document.uri, edit, edits);
@@ -201,7 +202,7 @@ export default class CodeActionProvider implements vscode.CodeActionProvider {
     private getInitializeFromCtorCommand(document: vscode.TextDocument, range: vscode.Range, context: vscode.CodeActionContext, token: vscode.CancellationToken, memberGenerationType: MemberGenerationType): vscode.Command | null {
         const editor = vscode.window.activeTextEditor;
 
-        if (editor == null) return null;
+        if (!editor) return null;
 
         const position = editor.selection.active;
         const surrounding = document.getText(new vscode.Range(new vscode.Position(position.line - 2, 0), new vscode.Position(position.line + 2, 0)));
@@ -221,7 +222,7 @@ export default class CodeActionProvider implements vscode.CodeActionProvider {
         ctorParamStr.split(',').forEach(strPart => {
             const separated = strPart.trim().split(' ');
 
-            if (separated[1].trim() == selectedName)
+            if (separated[1].trim() === selectedName)
                 parameterType = separated[0].trim();
         });
 
@@ -236,45 +237,45 @@ export default class CodeActionProvider implements vscode.CodeActionProvider {
         let name: string;
 
         switch (memberGenerationType) {
-            case MemberGenerationType.PrivateField:
-                title = 'Initialize field from parameter...';
-
-                memberGeneration = {
-                    type: memberGenerationType,
-                    declaration: `${Array(tabSize * 2).join(' ')} private readonly ${parameterType} ${privateMemberPrefix}${selectedName};\r\n`,
-                    assignment: `${Array(tabSize * 3).join(' ')} ${(prefixWithThis ? 'this.' : '')}${privateMemberPrefix}${selectedName} = ${selectedName};\r\n`
-                };
-                break;
-            case MemberGenerationType.ReadonlyProperty:
-                title = 'Initialize readonly property from parameter...';
-
-                name = selectedName[0].toUpperCase() + selectedName.substr(1);
-
-                memberGeneration = {
-                    type: memberGenerationType,
-                    declaration: `${Array(tabSize * 2).join(' ')} public ${parameterType} ${name} { get; }\r\n`,
-                    assignment: `${Array(tabSize * 3).join(' ')} ${(prefixWithThis ? 'this.' : '')}${name} = ${selectedName};\r\n`
-                };
-                break;
-            case MemberGenerationType.Property:
-                title = 'Initialize property from parameter...';
-
-                name = selectedName[0].toUpperCase() + selectedName.substr(1);
-
-                memberGeneration = {
-                    type: memberGenerationType,
-                    declaration: `${Array(tabSize * 2).join(' ')} public ${parameterType} ${name} { get; set; }\r\n`,
-                    assignment: `${Array(tabSize * 3).join(' ')} ${(prefixWithThis ? 'this.' : '')}${name} = ${selectedName};\r\n`
-                };
-                break;
-            default:
-                //TODO: Show error?
-                return null;
+        case MemberGenerationType.PrivateField:
+            title = 'Initialize field from parameter...';
+
+            memberGeneration = {
+                type: memberGenerationType,
+                declaration: `${Array(tabSize * 2).join(' ')} private readonly ${parameterType} ${privateMemberPrefix}${selectedName};\r\n`,
+                assignment: `${Array(tabSize * 3).join(' ')} ${(prefixWithThis ? 'this.' : '')}${privateMemberPrefix}${selectedName} = ${selectedName};\r\n`
+            };
+            break;
+        case MemberGenerationType.ReadonlyProperty:
+            title = 'Initialize readonly property from parameter...';
+
+            name = selectedName[0].toUpperCase() + selectedName.substr(1);
+
+            memberGeneration = {
+                type: memberGenerationType,
+                declaration: `${Array(tabSize * 2).join(' ')} public ${parameterType} ${name} { get; }\r\n`,
+                assignment: `${Array(tabSize * 3).join(' ')} ${(prefixWithThis ? 'this.' : '')}${name} = ${selectedName};\r\n`
+            };
+            break;
+        case MemberGenerationType.Property:
+            title = 'Initialize property from parameter...';
+
+            name = selectedName[0].toUpperCase() + selectedName.substr(1);
+
+            memberGeneration = {
+                type: memberGenerationType,
+                declaration: `${Array(tabSize * 2).join(' ')} public ${parameterType} ${name} { get; set; }\r\n`,
+                assignment: `${Array(tabSize * 3).join(' ')} ${(prefixWithThis ? 'this.' : '')}${name} = ${selectedName};\r\n`
+            };
+            break;
+        default:
+            //TODO: Show error?
+            return null;
         }
 
         const constructorBodyStart = this.findConstructorBodyStart(document, position);
 
-        if (constructorBodyStart == null) return null;
+        if (!constructorBodyStart) return null;
 
         const parameter: InitializeFieldFromConstructor = {
             document: document,
@@ -298,7 +299,7 @@ export default class CodeActionProvider implements vscode.CodeActionProvider {
         for (let lineNo = position.line; lineNo < position.line + 5; lineNo++) {
             const line = document.lineAt(lineNo);
 
-            if (line.text.indexOf('{') != -1)
+            if (line.text.indexOf('{') !== -1)
                 return new vscode.Position(lineNo + 1, 0);
         }
 

diff --git a/src/csprojReader.ts b/src/csprojReader.ts
@@ -1,5 +1,5 @@
-import Nameable from "./nameable";
-const xml2js = require("xml2js");
+import Nameable from './nameable';
+import * as xml2js from 'xml2js';
 
 export default class CsprojReader implements Nameable {
     private readonly xml: string;
@@ -33,11 +33,11 @@ export default class CsprojReader implements Nameable {
                     foundNamespace = propertyGroup.RootNamespace[0];
                     break;
                 }
-            };
+            }
 
             return foundNamespace;
         } catch (errParsingXml) {
-            console.error(`Error parsing project xml`, errParsingXml);
+            console.error('Error parsing project xml', errParsingXml);
         }
 
         return undefined;