Merge pull request zignd#50 from allevaton/simplify-codebase

zignd · web-flow · commit d186ac2e0066 · 2017-05-08T23:58:23.000-03:00
Simplify codebase
diff --git a/src/css-classes-storage.ts b/src/css-classes-storage.ts
@@ -1,5 +1,3 @@
-'use strict';
-
 import CssClassDefinition from './common/css-class-definition';
 
 class CssClassesStorage {
diff --git a/src/extension.ts b/src/extension.ts
@@ -1,5 +1,3 @@
-'use strict';
-
 import * as async from 'async';
 import * as _ from 'lodash';
 import * as vscode from 'vscode';
@@ -48,14 +46,13 @@ function cache(): Promise<void> {
                     return reject(error);
                 }
 
-                uniqueDefinitions = _.uniqBy(definitions, (x) => x.className);
+                uniqueDefinitions = _.uniqBy(definitions, def => def.className);
 
-                console.log('Sumary:');
+                console.log('Summary:');
                 console.log(uris.length, 'parseable documents found');
                 console.log(definitions.length, 'CSS class definitions found');
                 console.log(uniqueDefinitions.length, 'unique CSS class definitions found');
                 console.log(failedLogsCount, 'failed attempts to parse. List of the documents:');
-                console.log(failedLogs);
 
                 notifier.notify('zap', 'CSS classes cached (click to cache again)');
 
@@ -69,96 +66,30 @@ function cache(): Promise<void> {
     });
 }
 
-export async function activate(context: vscode.ExtensionContext): Promise<void> {
-    context.subscriptions.push(vscode.commands.registerCommand('html-css-class-completion.cache', async () => {
-        await cache();
-    }));
-
-    await cache();
-
-    context.subscriptions.push(vscode.languages.registerCompletionItemProvider('html', {
+function provideCompletionItemsGenerator(languageSelector: string, classMatchRegex: RegExp) {
+    return vscode.languages.registerCompletionItemProvider(languageSelector, {
         provideCompletionItems(document: vscode.TextDocument, position: vscode.Position): vscode.CompletionItem[] {
-            let start: vscode.Position = new vscode.Position(position.line, 0);
-            let range: vscode.Range = new vscode.Range(start, position);
-            let text: string = document.getText(range);
+            const start: vscode.Position = new vscode.Position(position.line, 0);
+            const range: vscode.Range = new vscode.Range(start, position);
+            const text: string = document.getText(range);
 
             // Check if the cursor is on a class attribute and retrieve all the css rules in this class attribute
-            let rawClasses: RegExpMatchArray = text.match(/class=["|']([\w- ]*$)/);
-            if (rawClasses === null) {
+            const rawClasses: RegExpMatchArray = text.match(classMatchRegex);
+            if (rawClasses.length === 1) {
                 return [];
             }
 
             // Will store the classes found on the class attribute
-            var classesOnAttribute: string[] = [];
-            // Regex to extract the classes found of the class attribute
-            var classesRegex: RegExp = /[ ]*([\w-]*)[ ]*/g;
-
-            var item: RegExpExecArray = null;
-            while ((item = classesRegex.exec(rawClasses[1])) !== null) {
-                if (item.index === classesRegex.lastIndex) {
-                    classesRegex.lastIndex++;
-                }
-                if (item !== null && item.length > 0) {
-                    classesOnAttribute.push(item[1]);
-                }
-            }
-            classesOnAttribute.pop();
+            let classesOnAttribute = rawClasses[1].split(' ');
 
             // Creates a collection of CompletionItem based on the classes already cached
-            var completionItems: vscode.CompletionItem[] = [];
-            for (var i = 0; i < uniqueDefinitions.length; i++) {
-                completionItems.push(new vscode.CompletionItem(uniqueDefinitions[i].className, vscode.CompletionItemKind.Variable));
-            }
-
-            // Removes from the collection the classes already specified on the class attribute
-            for (var i = 0; i < classesOnAttribute.length; i++) {
-                for (var j = 0; j < completionItems.length; j++) {
-                    if (completionItems[j].label === classesOnAttribute[i]) {
-                        completionItems.splice(j, 1);
-                    }
-                }
-            }
-
-            return completionItems;
-        }
-    }));
-    context.subscriptions.push(vscode.languages.registerCompletionItemProvider('typescriptreact', {
-        provideCompletionItems(document: vscode.TextDocument, position: vscode.Position): vscode.CompletionItem[] {
-            let start: vscode.Position = new vscode.Position(position.line, 0);
-            let range: vscode.Range = new vscode.Range(start, position);
-            let text: string = document.getText(range);
-
-            // Check if the cursor is on a class attribute and retrieve all the css rules in this class attribute
-            let rawClasses: RegExpMatchArray = text.match(/className=["|']([\w- ]*$)/);
-            if (rawClasses === null) {
-                return [];
-            }
-
-            // Will store the classes found on the class attribute
-            var classesOnAttribute: string[] = [];
-            // Regex to extract the classes found of the class attribute
-            var classesRegex: RegExp = /[ ]*([\w-]*)[ ]*/g;
-
-            var item: RegExpExecArray = null;
-            while ((item = classesRegex.exec(rawClasses[1])) !== null) {
-                if (item.index === classesRegex.lastIndex) {
-                    classesRegex.lastIndex++;
-                }
-                if (item !== null && item.length > 0) {
-                    classesOnAttribute.push(item[1]);
-                }
-            }
-            classesOnAttribute.pop();
-
-            // Creates a collection of CompletionItem based on the classes already cached
-            var completionItems: vscode.CompletionItem[] = [];
-            for (var i = 0; i < uniqueDefinitions.length; i++) {
-                completionItems.push(new vscode.CompletionItem(uniqueDefinitions[i].className, vscode.CompletionItemKind.Variable));
-            }
+            let completionItems = uniqueDefinitions.map(definition => {
+                return new vscode.CompletionItem(definition.className, vscode.CompletionItemKind.Variable);
+            });
 
             // Removes from the collection the classes already specified on the class attribute
-            for (var i = 0; i < classesOnAttribute.length; i++) {
-                for (var j = 0; j < completionItems.length; j++) {
+            for (let i = 0; i < classesOnAttribute.length; i++) {
+                for (let j = 0; j < completionItems.length; j++) {
                     if (completionItems[j].label === classesOnAttribute[i]) {
                         completionItems.splice(j, 1);
                     }
@@ -167,100 +98,28 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 
             return completionItems;
         }
-    }));
-    context.subscriptions.push(vscode.languages.registerCompletionItemProvider('javascript', {
-        provideCompletionItems(document: vscode.TextDocument, position: vscode.Position): vscode.CompletionItem[] {
-            let start: vscode.Position = new vscode.Position(position.line, 0);
-            let range: vscode.Range = new vscode.Range(start, position);
-            let text: string = document.getText(range);
-
-            // Check if the cursor is on a class attribute and retrieve all the css rules in this class attribute
-            let rawClasses: RegExpMatchArray = text.match(/className=["|']([\w- ]*$)/);
-            if (rawClasses === null) {
-                return [];
-            }
-
-            // Will store the classes found on the class attribute
-            var classesOnAttribute: string[] = [];
-            // Regex to extract the classes found of the class attribute
-            var classesRegex: RegExp = /[ ]*([\w-]*)[ ]*/g;
-
-            var item: RegExpExecArray = null;
-            while ((item = classesRegex.exec(rawClasses[1])) !== null) {
-                if (item.index === classesRegex.lastIndex) {
-                    classesRegex.lastIndex++;
-                }
-                if (item !== null && item.length > 0) {
-                    classesOnAttribute.push(item[1]);
-                }
-            }
-            classesOnAttribute.pop();
-
-            // Creates a collection of CompletionItem based on the classes already cached
-            var completionItems: vscode.CompletionItem[] = [];
-            for (var i = 0; i < uniqueDefinitions.length; i++) {
-                completionItems.push(new vscode.CompletionItem(uniqueDefinitions[i].className, vscode.CompletionItemKind.Variable));
-            }
-
-            // Removes from the collection the classes already specified on the class attribute
-            for (var i = 0; i < classesOnAttribute.length; i++) {
-                for (var j = 0; j < completionItems.length; j++) {
-                    if (completionItems[j].label === classesOnAttribute[i]) {
-                        completionItems.splice(j, 1);
-                    }
-                }
-            }
+    });
+}
 
-            return completionItems;
-        }
+export async function activate(context: vscode.ExtensionContext): Promise<void> {
+    context.subscriptions.push(vscode.commands.registerCommand('html-css-class-completion.cache', async () => {
+        await cache();
     }));
-    context.subscriptions.push(vscode.languages.registerCompletionItemProvider('javascriptreact', {
-        provideCompletionItems(document: vscode.TextDocument, position: vscode.Position): vscode.CompletionItem[] {
-            let start: vscode.Position = new vscode.Position(position.line, 0);
-            let range: vscode.Range = new vscode.Range(start, position);
-            let text: string = document.getText(range);
-
-            // Check if the cursor is on a class attribute and retrieve all the css rules in this class attribute
-            let rawClasses: RegExpMatchArray = text.match(/className=["|']([\w- ]*$)/);
-            if (rawClasses === null) {
-                return [];
-            }
 
-            // Will store the classes found on the class attribute
-            var classesOnAttribute: string[] = [];
-            // Regex to extract the classes found of the class attribute
-            var classesRegex: RegExp = /[ ]*([\w-]*)[ ]*/g;
+    const htmlRegex = /class=["|']([\w- ]*$)/;
+    const jsxRegex = /className=["|']([\w- ]*$)/;
 
-            
-            var item: RegExpExecArray = null;
-            while ((item = classesRegex.exec(rawClasses[1])) !== null) {
-                if (item.index === classesRegex.lastIndex) {
-                    classesRegex.lastIndex++;
-                }
-                if (item !== null && item.length > 0) {
-                    classesOnAttribute.push(item[1]);
-                }
-            }
-            classesOnAttribute.pop();
-
-            // Creates a collection of CompletionItem based on the classes already cached
-            var completionItems: vscode.CompletionItem[] = [];
-            for (var i = 0; i < uniqueDefinitions.length; i++) {
-                completionItems.push(new vscode.CompletionItem(uniqueDefinitions[i].className, vscode.CompletionItemKind.Variable));
-            }
+    const html = provideCompletionItemsGenerator('html', htmlRegex)
+    const tsReact = provideCompletionItemsGenerator('typescriptreact', jsxRegex);
+    const js = provideCompletionItemsGenerator('javascript', jsxRegex)
+    const jsReact = provideCompletionItemsGenerator('javascriptreact', jsxRegex);
 
-            // Removes from the collection the classes already specified on the class attribute
-            for (var i = 0; i < classesOnAttribute.length; i++) {
-                for (var j = 0; j < completionItems.length; j++) {
-                    if (completionItems[j].label === classesOnAttribute[i]) {
-                        completionItems.splice(j, 1);
-                    }
-                }
-            }
+    context.subscriptions.push(html);
+    context.subscriptions.push(tsReact);
+    context.subscriptions.push(js);
+    context.subscriptions.push(jsReact);
 
-            return completionItems;
-        }
-    }));
+    await cache();
 }
 
 export function deactivate(): void {
diff --git a/src/fetcher.ts b/src/fetcher.ts
@@ -1,24 +1,12 @@
-'use strict';
-
 import * as vscode from 'vscode';
 import ParseEngineRegistry from './parse-engines/parse-engine-registry';
 
 class Fetcher {
     static async findAllParseableDocuments(): Promise<vscode.Uri[]> {
-        let include: string = ParseEngineRegistry.supportedLanguagesIds.reduce(
-            (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => {
-                previousValue += `**/*.${currentValue}`;
-                if (currentIndex != array.length - 1) {
-                    previousValue += `, `;
-                }
-                return previousValue;
-            }, "");
-
-        let exclude: string = 'node_modules/**/node_modules/**/*';
+        const exclude = 'node_modules/**/*';
+        const languages = ParseEngineRegistry.supportedLanguagesIds.join(',');
 
-        let uris = await vscode.workspace.findFiles(include, exclude);
-        
-        return uris;
+        return await vscode.workspace.findFiles(`**/*.{${languages}}`, exclude);
     }
 }
 
diff --git a/src/notifier.ts b/src/notifier.ts
@@ -1,5 +1,3 @@
-'use strict';
-
 import * as vscode from 'vscode';
 
 class Notifier {
diff --git a/src/parse-engine-gateway.ts b/src/parse-engine-gateway.ts
@@ -1,5 +1,3 @@
-'use strict';
-
 import * as vscode from 'vscode';
 import CssClassDefinition from './common/css-class-definition';
 import ParseEngine from './parse-engines/common/parse-engine';
diff --git a/src/parse-engines/common/css-class-extractor.ts b/src/parse-engines/common/css-class-extractor.ts
@@ -0,0 +1,32 @@
+import * as css from 'css';
+import CssClassDefinition from '../../common/css-class-definition';
+
+export default class CssClassExtractor {
+    /**
+     * @description Extracts class names from CSS AST
+     */
+    static extract(ast: css.Stylesheet): CssClassDefinition[] {
+        // TODO can we make this asynchronous?
+
+        const classNameRegex: RegExp = /[.]([\w-]+)/g;
+
+        let definitions: CssClassDefinition[] = [];
+
+        // go through each of the rules...
+        ast.stylesheet.rules.forEach((rule: css.Rule) => {
+            // ...of type rule
+            if (rule.type === 'rule') {
+                // go through each of the selectors of the current rule 
+                rule.selectors.forEach((selector: string) => {
+                    let item: RegExpExecArray = null;
+
+                    while (item = classNameRegex.exec(selector)) {
+                        definitions.push(new CssClassDefinition(item[1]));
+                    }
+                });
+            }
+        });
+
+        return definitions;
+    }
+}
diff --git a/src/parse-engines/common/parse-engine.ts b/src/parse-engines/common/parse-engine.ts
@@ -1,5 +1,3 @@
-'use strict';
-
 import * as vscode from 'vscode';
 import CssClassDefinition from './../../common/css-class-definition';
 
diff --git a/src/parse-engines/parse-engine-registry.ts b/src/parse-engines/parse-engine-registry.ts
@@ -1,5 +1,3 @@
-'use strict';
-
 import ParseEngine from './common/parse-engine';
 import CssParseEngine from './types/css-parse-engine';
 
@@ -11,20 +9,14 @@ class ParseEngineRegistry {
 
     public static get supportedLanguagesIds(): string[] {
         if (!ParseEngineRegistry._supportedLanguagesIds) {
-            ParseEngineRegistry._supportedLanguagesIds = ParseEngineRegistry._registry.reduce<string[]>(
-                (previousValue: string[], currentValue: ParseEngine, currentIndex: number, array: ParseEngine[]) => {
-                    previousValue.push(currentValue.languageId)
-                    return previousValue;
-                }, []);
+            ParseEngineRegistry._supportedLanguagesIds = ParseEngineRegistry._registry.map(parseEngine => parseEngine.languageId);
         }
 
         return ParseEngineRegistry._supportedLanguagesIds;
     }
 
     public static getParseEngine(languageId: string): ParseEngine {
-        let foundParseEngine: ParseEngine = ParseEngineRegistry._registry.find((value: ParseEngine, index: number, obj: ParseEngine[]) => {
-            return value.languageId === languageId;
-        });
+        let foundParseEngine = ParseEngineRegistry._registry.find(value => value.languageId === languageId);
 
         if (!foundParseEngine) {
             throw `Could not find a parse engine for the provided language id ("${languageId}").`;
diff --git a/src/parse-engines/types/css-parse-engine.ts b/src/parse-engines/types/css-parse-engine.ts
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-'use strict';`
`2`		`-`
`3`	`1`	`import CssClassDefinition from './common/css-class-definition';`
`4`	`2`
`5`	`3`	`class CssClassesStorage {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-'use strict';`
`2`		`-`
`3`	`1`	`import * as vscode from 'vscode';`
`4`	`2`
`5`	`3`	`class Notifier {`