1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17

diff --git a/package-lock.json b/package-lock.json
index d966ffc1c7ab17034ffc3fd6dd170f41dbe9bdfa..d3461d15178fbd81895623d655bde63ebf413264 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -4910,6 +4910,12 @@ 			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
 			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
 			"dev": true
 		},
+		"mitt": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/mitt/-/mitt-1.2.0.tgz",
+			"integrity": "sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==",
+			"dev": true
+		},
 		"mixin-deep": {
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12

diff --git a/package.json b/package.json
index 2e233599bbf936a4492be89bd6114222464007bf..69d62d97f70770c055be6a9d69bc98fb4d3f295a 100755
--- a/package.json
+++ b/package.json
@@ -91,6 +91,7 @@     "globrex": "^0.1.2",
     "import-from": "^3.0.0",
     "jest": "^25.5.4",
     "line-column": "^1.0.2",
+    "mitt": "^1.2.0",
     "mkdirp": "^1.0.3",
     "pkg-up": "^3.1.0",
     "postcss": "^7.0.27",

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22

diff --git a/src/extension.ts b/src/extension.ts
index 2497372df113002f18b7bc1ec6a65a46d054c62e..be1fe479cac88456c5893e28a533d1c3c2ec81ca 100755
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -21,6 +21,7 @@ import { registerConfigErrorHandler } from './lib/registerConfigErrorHandler'
 import { DEFAULT_LANGUAGES } from './lib/languages'
 import isObject from './util/isObject'
 import { dedupe, equal } from './util/array'
+import { createEmitter } from './lib/emitter'
 
 const CLIENT_ID = 'tailwindcss-intellisense'
 const CLIENT_NAME = 'Tailwind CSS IntelliSense'
@@ -147,7 +148,8 @@       clientOptions
     )
 
     client.onReady().then(() => {
-      registerConfigErrorHandler(client)
+      let emitter = createEmitter(client)
+      registerConfigErrorHandler(emitter)
     })
 
     client.start()

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56

diff --git a/src/lib/emitter.ts b/src/lib/emitter.ts
new file mode 100644
index 0000000000000000000000000000000000000000..d177c2cf355a60b5c265fb5df12b01e0feb0ffb6
--- /dev/null
+++ b/src/lib/emitter.ts
@@ -0,0 +1,50 @@
+import mitt from 'mitt'
+import { LanguageClient } from 'vscode-languageclient'
+import crypto from 'crypto'
+
+export interface NotificationEmitter {
+  on: (name: string, handler: (args: any) => void) => void
+  off: (name: string, handler: (args: any) => void) => void
+  emit: (name: string, args: any) => Promise<any>
+}
+
+export function createEmitter(client: LanguageClient): NotificationEmitter {
+  const emitter = mitt()
+  const registered: string[] = []
+
+  const on = (name: string, handler: (args: any) => void) => {
+    if (!registered.includes(name)) {
+      registered.push(name)
+      client.onNotification(`tailwindcss/${name}`, (args) =>
+        emitter.emit(name, args)
+      )
+    }
+    emitter.on(name, handler)
+  }
+
+  const off = (name: string, handler: (args: any) => void) => {
+    emitter.off(name, handler)
+  }
+
+  const emit = (name: string, params: any) => {
+    return new Promise((resolve, _reject) => {
+      const id = crypto.randomBytes(16).toString('hex')
+      on(`${name}Response`, (result) => {
+        const { _id, ...rest } = result
+        if (_id === id) {
+          resolve(rest)
+        }
+      })
+      client.sendNotification(`tailwindcss/${name}`, {
+        _id: id,
+        ...params,
+      })
+    })
+  }
+
+  return {
+    on,
+    off,
+    emit,
+  }
+}

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44

diff --git a/src/lib/registerConfigErrorHandler.ts b/src/lib/registerConfigErrorHandler.ts
index 819458efb3a9286fbf011b6f03c77558b6058428..80ee6a594334c986741ba68b4bf2e96ac70008fb 100644
--- a/src/lib/registerConfigErrorHandler.ts
+++ b/src/lib/registerConfigErrorHandler.ts
@@ -1,23 +1,20 @@
-import { LanguageClient } from 'vscode-languageclient'
 import { window, Uri, Range, Position } from 'vscode'
+import { NotificationEmitter } from './emitter'
 
-export function registerConfigErrorHandler(client: LanguageClient) {
-  client.onNotification(
-    'tailwindcss/configError',
-    async ({ message, file, line }) => {
-      const actions: string[] = file ? ['View'] : []
-      const action = await window.showErrorMessage(
-        `Tailwind CSS: ${message}`,
-        ...actions
-      )
-      if (action === 'View') {
-        window.showTextDocument(Uri.file(file), {
-          selection: new Range(
-            new Position(line - 1, 0),
-            new Position(line - 1, 0)
-          ),
-        })
-      }
+export function registerConfigErrorHandler(emitter: NotificationEmitter) {
+  emitter.on('configError', async ({ message, file, line }) => {
+    const actions: string[] = file ? ['View'] : []
+    const action = await window.showErrorMessage(
+      `Tailwind CSS: ${message}`,
+      ...actions
+    )
+    if (action === 'View') {
+      window.showTextDocument(Uri.file(file), {
+        selection: new Range(
+          new Position(line - 1, 0),
+          new Position(line - 1, 0)
+        ),
+      })
     }
-  )
+  })
 }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21

diff --git a/src/lsp/notifications.ts b/src/lsp/notifications.ts
new file mode 100644
index 0000000000000000000000000000000000000000..bb4e60dc496922fe1221147ff41a690e5f60d344
--- /dev/null
+++ b/src/lsp/notifications.ts
@@ -0,0 +1,15 @@
+import { Connection } from 'vscode-languageserver'
+
+export function onMessage(
+  connection: Connection,
+  name: string,
+  handler: (params: any) => any
+): void {
+  connection.onNotification(`tailwindcss/${name}`, async (params: any) => {
+    const { _id, ...rest } = params
+    connection.sendNotification(`tailwindcss/${name}Response`, {
+      _id,
+      ...(await handler(rest)),
+    })
+  })
+}