Extract LanguageServiceFactory

Author: mjbvz

e2e/tests/errors.js

@@ -254,5 +254,16 @@ describe('Errors', () => {
             assert.strictEqual(errorResponse.body.length, 0);
         });
     });
+
+    it('should not return an error for a placeholder as the declaration name (#52)', () => {
+        return getSemanticDiagnosticsForFile(
+            `function css(strings, ...) { return ""; }; const value = 1; const q = css\`
+            $\{'width'}: 1px;
+        \``
+        ).then(errorResponse => {
+            assert.isTrue(errorResponse.success);
+            assert.strictEqual(errorResponse.body.length, 0);
+        });
+    });
 });
 

package-lock.json

@@ -20,7 +20,7 @@
     "url": "https://github.com/Microsoft/typescript-styled-plugin/issues"
   },
   "dependencies": {
-    "typescript-template-language-service-decorator": "^1.4.0",
+    "typescript-template-language-service-decorator": "^1.5.0",
     "vscode-css-languageservice": "^3.0.9-next.19",
     "vscode-languageserver-types": "^3.8.2",
     "vscode-emmet-helper": "1.2.10"

package.json

@@ -10,25 +10,29 @@ import { LanguageServiceLogger } from './logger';
 import StyledTemplateLanguageService from './styled-template-language-service';
 import { getSubstitution } from './substituter';
 
-export = (mod: { typescript: typeof ts }) => {
-    return {
-        create(info: ts.server.PluginCreateInfo): ts.LanguageService {
-            const logger = new LanguageServiceLogger(info);
-            const config = loadConfiguration(info.config);
+class LanguageServiceFactory {
+    public constructor(
+        private readonly typescript: typeof ts
+    ) { }
 
-            logger.log('config: ' + JSON.stringify(config));
+    public create(info: ts.server.PluginCreateInfo): ts.LanguageService {
+        const logger = new LanguageServiceLogger(info);
+        const config = loadConfiguration(info.config);
 
-            return decorateWithTemplateLanguageService(mod.typescript, info.languageService, new StyledTemplateLanguageService(mod.typescript, config, logger), {
-                tags: config.tags,
-                enableForStringWithSubstitutions: true,
-                getSubstitution(
-                    templateString: string,
-                    start: number,
-                    end: number
-                ): string {
-                    return getSubstitution(templateString, start, end, logger);
-                },
-            }, { logger });
-        },
-    };
-};
+        logger.log('config: ' + JSON.stringify(config));
+
+        return decorateWithTemplateLanguageService(this.typescript, info.languageService, new StyledTemplateLanguageService(this.typescript, config, logger), {
+            tags: config.tags,
+            enableForStringWithSubstitutions: true,
+            getSubstitution(
+                templateString: string,
+                start: number,
+                end: number
+            ): string {
+                return getSubstitution(templateString, start, end, logger);
+            },
+        }, { logger });
+    }
+}
+
+export = (mod: { typescript: typeof ts }) => new LanguageServiceFactory(mod.typescript);