chore

Author: sastan

README.md

@@ -2,7 +2,7 @@
 
 <div align="center">
 
-> TypeScript language service plugin that adds IntelliSense for tailwindjs
+> TypeScript language service plugin that adds IntelliSense for Twind
 
 [![MIT License](https://flat.badgen.net/github/license/tw-in-js/typescript-plugin)](https://github.com/tw-in-js/typescript-plugin/blob/main/LICENSE)
 [![Latest Release](https://flat.badgen.net/npm/v/@twind/typescript-plugin?icon=npm&label)](https://www.npmjs.com/package/@twind/typescript-plugin)
@@ -101,6 +101,7 @@ By default VS Code will not trigger completions when editing "string" content, f
 
 ```json
 {
+  "editor.suggest.showStatusBar": true,
   "editor.quickSuggestions": {
     "strings": true
   }

package.json

@@ -87,7 +87,7 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "twind": ">=0.16.0 <2"
+    "twind": ">=0.16.6 <2"
   },
   "peerDependenciesMeta": {
     "twind": {
@@ -101,7 +101,7 @@
     "locate-path": "^6.0.0",
     "match-sorter": "^6.3.0",
     "resolve-from": "^5.0.0",
-    "twind": "^0.16.0",
+    "twind": "^0.16.6",
     "typescript": "^4.1.0",
     "typescript-template-language-service-decorator": "^2.2.0",
     "vscode-languageserver-types": "^3.13.0"
@@ -111,7 +111,7 @@
     "@types/node": "^14.14.34",
     "@typescript-eslint/eslint-plugin": "^4.9.1",
     "@typescript-eslint/parser": "^4.9.1",
-    "distilt": "^0.10.1",
+    "distilt": "^0.10.3",
     "esbuild-register": "^2.3.0",
     "eslint": "^7.15.0",
     "eslint-config-prettier": "^7.0.0",

src/configuration.ts

@@ -1,5 +1,6 @@
 export interface TwindPluginConfiguration {
   readonly tags: ReadonlyArray<string>
+  readonly configFile?: string;
   readonly debug: boolean
   // Readonly validate: boolean;
   // readonly lint: { [key: string]: any };

src/plugin.ts

@@ -27,9 +27,10 @@ export class TwindPlugin {
       return info.languageService
     }
 
-    // // Set up decorator
+    // Set up decorator
     // const { languageService } = info
 
+    // this.typescript.parseIsolatedEntityName(text, languageVersion)
     // info.languageService = {
     //   ...info.languageService,
 
@@ -47,8 +48,12 @@ export class TwindPlugin {
     //     // emmetCompletions: false
     //     const prior = languageService.getCompletionsAtPosition(fileName, position, options)
 
+    //     // options?.triggerCharacter
     //     // TODO match file [t]sx?
-    //     const contents = info.project.readFile(fileName)
+    //     const sourceFile = info.languageService.getProgram()?.getSourceFile(fileName)
+    //     sourceFile?.getLineAndCharacterOfPosition(position)
+    //     sourceFile?.getText()
+    //     // IDEA: find last "'` before position
 
     //     // logger.log('getCompletionsAtPosition: ' + JSON.stringify({ fileName, position }))
 

yarn.lock

@@ -344,13 +344,13 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-distilt@^0.10.1:
-  version "0.10.1"
-  resolved "https://registry.npmjs.org/distilt/-/distilt-0.10.1.tgz#7603f8f3b64c24e7ed66a696ee0ec85dbb2d4dc4"
-  integrity sha512-JZSjKlpXMDBunrwlpDZW3+L+UlnjaSP1egOfEPix7anPXG24Mq3d9SRghpQkoZs8jeCq76Gnp3/VL2uM1NXtSA==
+distilt@^0.10.3:
+  version "0.10.3"
+  resolved "https://registry.npmjs.org/distilt/-/distilt-0.10.3.tgz#24bba0228a7df163522bc00444775a61ef8a4d8f"
+  integrity sha512-ieyPdDJSUQ0fOAiXwnPIfv4jRjhP3v6zzC544RjD2gMhnV/MVMY62fQkHkDh7b4zmU88vahvINaIXLA9wDv31A==
   dependencies:
     es-module-lexer "^0.3.26"
-    esbuild "^0.8.28"
+    esbuild "^0.9.3"
     execa "^5.0.0"
     find-up "^5.0.0"
     globby "^11.0.1"
@@ -426,11 +426,6 @@ esbuild-register@^2.3.0:
     esbuild "^0.9.2"
     jsonc-parser "^3.0.0"
 
-esbuild@^0.8.28:
-  version "0.8.57"
-  resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.8.57.tgz#a42d02bc2b57c70bcd0ef897fe244766bb6dd926"
-  integrity sha512-j02SFrUwFTRUqiY0Kjplwjm1psuzO1d6AjaXKuOR9hrY0HuPsT6sV42B6myW34h1q4CRy+Y3g4RU/cGJeI/nNA==
-
 esbuild@^0.9.2:
   version "0.9.2"
   resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.9.2.tgz#7e9fde247c913ed8ee059e2648b0c53f7d00abe5"
@@ -1265,10 +1260,10 @@ tsutils@^3.17.1:
   dependencies:
     tslib "^1.8.1"
 
-twind@^0.16.0:
-  version "0.16.0"
-  resolved "https://registry.npmjs.org/twind/-/twind-0.16.0.tgz#8045ae7178149aaa94669669ea98c1f129a0ef82"
-  integrity sha512-dAslmdmPi8N9dmEB2ZgZewqTHnkC2K39WaPQSWAqon+oKhn7sh4wd5R0zkxvPpbB8QGLdGxeEOZJjQt5RgS57Q==
+twind@^0.16.6:
+  version "0.16.6"
+  resolved "https://registry.npmjs.org/twind/-/twind-0.16.6.tgz#2da593cc390311cb6284252cd169518f6c524a70"
+  integrity sha512-YQ6d3KPfqwyytY/TGXuKquNagbAfyOKITP40i/4PHRwNvcQU+z56ralLp0aRW0ydVUVQZC+vR/2UFU9i0xc+/w==
   dependencies:
     csstype "^3.0.5"
     htmlparser2 "^6.0.0"