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
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
|
diff --git a/packages/tailwindcss-language-server/src/server.ts b/packages/tailwindcss-language-server/src/server.ts
index 809c79d62601bebcdd608f705dbb9bb52f58af18..463b3639274bdd51cad3d85e985a347296370a9e 100644
--- a/packages/tailwindcss-language-server/src/server.ts
+++ b/packages/tailwindcss-language-server/src/server.ts
@@ -23,6 +23,8 @@ BulkRegistration,
CodeActionRequest,
BulkUnregistration,
HoverRequest,
+ DidChangeWatchedFilesNotification,
+ FileChangeType,
} from 'vscode-languageserver/node'
import { TextDocument } from 'vscode-languageserver-textdocument'
import { URI } from 'vscode-uri'
@@ -32,7 +34,7 @@ import normalizePath from 'normalize-path'
import * as path from 'path'
import * as os from 'os'
import * as fs from 'fs'
-import chokidar from 'chokidar'
+import chokidar, { FSWatcher } from 'chokidar'
import findUp from 'find-up'
import minimatch from 'minimatch'
import resolveFrom, { setPnpApi } from './util/resolveFrom'
@@ -206,47 +208,87 @@
const documentSettingsCache: Map<string, Settings> = new Map()
let registrations: Promise<BulkUnregistration>
- const watcher = chokidar.watch(
- [normalizePath(`${folder}/**/${CONFIG_FILE_GLOB}`), normalizePath(`${folder}/**/package.json`)],
- {
- ignorePermissionErrors: true,
- ignoreInitial: true,
- ignored: ['**/node_modules/**'],
- awaitWriteFinish: {
- stabilityThreshold: 100,
- pollInterval: 20,
- },
+ let watcher: FSWatcher
+
+ function onFileEvents(changes: Array<{ file: string; type: FileChangeType }>): void {
+ let needsInit = false
+ let needsRebuild = false
+
+ for (let change of changes) {
+ let file = normalizePath(change.file)
+
+ if (change.type === FileChangeType.Created) {
+ needsInit = true
+ break
+ } else if (change.type === FileChangeType.Changed) {
+ if (!state.enabled || minimatch(file, '**/package.json')) {
+ needsInit = true
+ break
+ } else {
+ needsRebuild = true
+ }
+ } else if (change.type === FileChangeType.Deleted) {
+ if (
+ !state.enabled ||
+ minimatch(file, '**/package.json') ||
+ minimatch(file, `**/${CONFIG_FILE_GLOB}`)
+ ) {
+ needsInit = true
+ break
+ } else {
+ needsRebuild = true
+ }
+ }
}
- )
- await new Promise<void>((resolve) => {
- watcher.on('ready', () => resolve())
- })
+ if (needsInit) {
+ tryInit()
+ } else if (needsRebuild) {
+ tryRebuild()
+ }
+ }
- watcher
- .on('add', () => {
- tryInit()
+ if (params.capabilities.workspace?.didChangeWatchedFiles?.dynamicRegistration) {
+ connection.onDidChangeWatchedFiles(({ changes }) => {
+ onFileEvents(
+ changes.map(({ uri, type }) => ({
+ file: URI.parse(uri).fsPath,
+ type,
+ }))
+ )
})
- .on('unlink', (file) => {
- if (
- !state.enabled ||
- minimatch(file, '**/package.json') ||
- minimatch(file, `**/${CONFIG_FILE_GLOB}`)
- ) {
- tryInit()
- } else {
- tryRebuild()
- }
+
+ connection.client.register(DidChangeWatchedFilesNotification.type, {
+ watchers: [{ globPattern: `**/${CONFIG_FILE_GLOB}` }, { globPattern: '**/package.json' }],
})
- .on('change', (file) => {
- if (!state.enabled || minimatch(file, '**/package.json')) {
- tryInit()
- } else {
- tryRebuild()
+ } else {
+ watcher = chokidar.watch(
+ [
+ normalizePath(`${folder}/**/${CONFIG_FILE_GLOB}`),
+ normalizePath(`${folder}/**/package.json`),
+ ],
+ {
+ ignorePermissionErrors: true,
+ ignoreInitial: true,
+ ignored: ['**/node_modules/**'],
+ awaitWriteFinish: {
+ stabilityThreshold: 100,
+ pollInterval: 20,
+ },
}
+ )
+
+ await new Promise<void>((resolve) => {
+ watcher.on('ready', () => resolve())
})
- function registerCapabilities(): void {
+ watcher
+ .on('add', (file) => onFileEvents([{ file, type: FileChangeType.Created }]))
+ .on('change', (file) => onFileEvents([{ file, type: FileChangeType.Changed }]))
+ .on('unlink', (file) => onFileEvents([{ file, type: FileChangeType.Deleted }]))
+ }
+
+ function registerCapabilities(watchFiles?: string[]): void {
if (supportsDynamicRegistration(connection, params)) {
if (registrations) {
registrations.then((r) => r.dispose())
@@ -268,6 +310,11 @@ documentSelector: null,
resolveProvider: true,
triggerCharacters: [...TRIGGER_CHARACTERS, state.separator],
})
+ if (watchFiles) {
+ capabilities.add(DidChangeWatchedFilesNotification.type, {
+ watchers: watchFiles.map((file) => ({ globPattern: file })),
+ })
+ }
registrations = connection.client.register(capabilities)
}
@@ -766,10 +813,10 @@ hook.unhook()
}
if (state.dependencies) {
- watcher.unwatch(state.dependencies)
+ watcher?.unwatch(state.dependencies)
}
state.dependencies = getModuleDependencies(state.configPath)
- watcher.add(state.dependencies)
+ watcher?.add(state.dependencies)
state.configId = getConfigId(state.configPath, state.dependencies)
@@ -784,7 +831,7 @@ state.enabled = true
updateAllDiagnostics(state)
- registerCapabilities()
+ registerCapabilities(state.dependencies)
}
return {
@@ -796,7 +843,7 @@ if (state.enabled) {
updateAllDiagnostics(state)
}
if (settings.editor.colorDecorators) {
- registerCapabilities()
+ registerCapabilities(state.dependencies)
} else {
connection.sendNotification('@/tailwindCSS/clearColors')
}
|