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
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
|
diff --git a/packages/tailwindcss-language-server/src/server.ts b/packages/tailwindcss-language-server/src/server.ts
index 463b3639274bdd51cad3d85e985a347296370a9e..04da9276a862fdbe75749045b8f8318c679ff8b1 100644
--- a/packages/tailwindcss-language-server/src/server.ts
+++ b/packages/tailwindcss-language-server/src/server.ts
@@ -25,6 +25,7 @@ BulkUnregistration,
HoverRequest,
DidChangeWatchedFilesNotification,
FileChangeType,
+ Disposable,
} from 'vscode-languageserver/node'
import { TextDocument } from 'vscode-languageserver-textdocument'
import { URI } from 'vscode-uri'
@@ -73,6 +74,7 @@ import { debounce } from 'debounce'
import { getModuleDependencies } from './util/getModuleDependencies'
import assert from 'assert'
// import postcssLoadConfig from 'postcss-load-config'
+import * as parcel from './watcher/index.js'
const CONFIG_FILE_GLOB = '{tailwind,tailwind.config}.{js,cjs}'
const TRIGGER_CHARACTERS = [
@@ -151,6 +153,7 @@
interface ProjectService {
state: State
tryInit: () => Promise<void>
+ dispose: () => void
onUpdateSettings: (settings: any) => void
onHover(params: TextDocumentPositionParams): Promise<Hover>
onCompletion(params: CompletionParams): Promise<CompletionList>
@@ -167,6 +170,7 @@ connection: Connection,
params: InitializeParams,
documentService: DocumentService
): Promise<ProjectService> {
+ const disposables: Disposable[] = []
const state: State = {
enabled: false,
editor: {
@@ -208,7 +212,13 @@
const documentSettingsCache: Map<string, Settings> = new Map()
let registrations: Promise<BulkUnregistration>
- let watcher: FSWatcher
+ let chokidarWatcher: FSWatcher
+ let ignore = [
+ '**/.git/objects/**',
+ '**/.git/subtree-cache/**',
+ '**/node_modules/**',
+ '**/.hg/store/**',
+ ]
function onFileEvents(changes: Array<{ file: string; type: FileChangeType }>): void {
let needsInit = false
@@ -217,22 +227,30 @@
for (let change of changes) {
let file = normalizePath(change.file)
+ for (let ignorePattern of ignore) {
+ if (minimatch(file, ignorePattern)) {
+ continue
+ }
+ }
+
+ let isConfigFile = minimatch(file, `**/${CONFIG_FILE_GLOB}`)
+ let isPackageFile = minimatch(file, '**/package.json')
+ let isDependency = state.dependencies && state.dependencies.includes(change.file)
+
+ if (!isConfigFile && !isPackageFile && !isDependency) continue
+
if (change.type === FileChangeType.Created) {
needsInit = true
break
} else if (change.type === FileChangeType.Changed) {
- if (!state.enabled || minimatch(file, '**/package.json')) {
+ if (!state.enabled || isPackageFile) {
needsInit = true
break
} else {
needsRebuild = true
}
} else if (change.type === FileChangeType.Deleted) {
- if (
- !state.enabled ||
- minimatch(file, '**/package.json') ||
- minimatch(file, `**/${CONFIG_FILE_GLOB}`)
- ) {
+ if (!state.enabled || isPackageFile || isConfigFile) {
needsInit = true
break
} else {
@@ -261,34 +279,59 @@
connection.client.register(DidChangeWatchedFilesNotification.type, {
watchers: [{ globPattern: `**/${CONFIG_FILE_GLOB}` }, { globPattern: '**/package.json' }],
})
- } else {
- watcher = chokidar.watch(
- [
- normalizePath(`${folder}/**/${CONFIG_FILE_GLOB}`),
- normalizePath(`${folder}/**/package.json`),
- ],
+ } else if (parcel.getBinding()) {
+ let typeMap = {
+ create: FileChangeType.Created,
+ update: FileChangeType.Changed,
+ delete: FileChangeType.Deleted,
+ }
+
+ let subscription = await parcel.subscribe(
+ folder,
+ (err, events) => {
+ onFileEvents(events.map((event) => ({ file: event.path, type: typeMap[event.type] })))
+ },
{
- ignorePermissionErrors: true,
- ignoreInitial: true,
- ignored: ['**/node_modules/**'],
- awaitWriteFinish: {
- stabilityThreshold: 100,
- pollInterval: 20,
- },
+ ignore: ignore.map((ignorePattern) =>
+ path.resolve(folder, ignorePattern.replace(/^[*/]+/, '').replace(/[*/]+$/, ''))
+ ),
}
)
+ disposables.push({
+ dispose() {
+ subscription.unsubscribe()
+ },
+ })
+ } else {
+ chokidarWatcher = chokidar.watch([`**/${CONFIG_FILE_GLOB}`, '**/package.json'], {
+ cwd: folder,
+ ignorePermissionErrors: true,
+ ignoreInitial: true,
+ ignored: ignore,
+ awaitWriteFinish: {
+ stabilityThreshold: 100,
+ pollInterval: 20,
+ },
+ })
+
await new Promise<void>((resolve) => {
- watcher.on('ready', () => resolve())
+ chokidarWatcher.on('ready', () => resolve())
})
- watcher
+ chokidarWatcher
.on('add', (file) => onFileEvents([{ file, type: FileChangeType.Created }]))
.on('change', (file) => onFileEvents([{ file, type: FileChangeType.Changed }]))
.on('unlink', (file) => onFileEvents([{ file, type: FileChangeType.Deleted }]))
+
+ disposables.push({
+ dispose() {
+ chokidarWatcher.close()
+ },
+ })
}
- function registerCapabilities(watchFiles?: string[]): void {
+ function registerCapabilities(watchFiles: string[] = []): void {
if (supportsDynamicRegistration(connection, params)) {
if (registrations) {
registrations.then((r) => r.dispose())
@@ -310,7 +353,7 @@ documentSelector: null,
resolveProvider: true,
triggerCharacters: [...TRIGGER_CHARACTERS, state.separator],
})
- if (watchFiles) {
+ if (watchFiles.length > 0) {
capabilities.add(DidChangeWatchedFilesNotification.type, {
watchers: watchFiles.map((file) => ({ globPattern: file })),
})
@@ -323,13 +366,13 @@
function resetState(): void {
clearAllDiagnostics(state)
Object.keys(state).forEach((key) => {
- if (key !== 'editor') {
+ // Keep `dependencies` to ensure that they are still watched
+ if (key !== 'editor' && key !== 'dependencies') {
delete state[key]
}
})
state.enabled = false
- registerCapabilities()
- // TODO reset watcher (remove config dependencies)
+ registerCapabilities(state.dependencies)
}
async function tryInit() {
@@ -813,10 +856,10 @@ hook.unhook()
}
if (state.dependencies) {
- watcher?.unwatch(state.dependencies)
+ chokidarWatcher?.unwatch(state.dependencies)
}
state.dependencies = getModuleDependencies(state.configPath)
- watcher?.add(state.dependencies)
+ chokidarWatcher?.add(state.dependencies)
state.configId = getConfigId(state.configPath, state.dependencies)
@@ -837,6 +880,11 @@
return {
state,
tryInit,
+ dispose() {
+ for (let { dispose } of disposables) {
+ dispose()
+ }
+ },
onUpdateSettings(settings: any): void {
documentSettingsCache.clear()
if (state.enabled) {
@@ -1279,7 +1327,9 @@ this.connection.listen()
}
dispose(): void {
- //
+ for (let [, project] of this.projects) {
+ project.dispose()
+ }
}
}
|