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
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
|
diff --git a/packages/tailwindcss-language-server/src/server.ts b/packages/tailwindcss-language-server/src/server.ts
index f0828133bacb40d84c43d926e09a3a97e69e03c1..615fd950af66066fcf399e3803fb15c1f219695a 100644
--- a/packages/tailwindcss-language-server/src/server.ts
+++ b/packages/tailwindcss-language-server/src/server.ts
@@ -26,6 +26,7 @@ HoverRequest,
DidChangeWatchedFilesNotification,
FileChangeType,
Disposable,
+ TextDocumentIdentifier,
} from 'vscode-languageserver/node'
import { TextDocument } from 'vscode-languageserver-textdocument'
import { URI } from 'vscode-uri'
@@ -177,6 +178,7 @@ state: State
tryInit: () => Promise<void>
dispose: () => void
onUpdateSettings: (settings: any) => void
+ onFileEvents: (changes: Array<{ file: string; type: FileChangeType }>) => void
onHover(params: TextDocumentPositionParams): Promise<Hover>
onCompletion(params: CompletionParams): Promise<CompletionList>
onCompletionResolve(item: CompletionItem): Promise<CompletionItem>
@@ -185,6 +187,8 @@ onDocumentColor(params: DocumentColorParams): Promise<ColorInformation[]>
onColorPresentation(params: ColorPresentationParams): Promise<ColorPresentation[]>
onCodeAction(params: CodeActionParams): Promise<CodeAction[]>
}
+
+type ProjectConfig = { folder: string; configPath?: string; documentSelector?: string[] }
function getMode(config: any): unknown {
if (typeof config.mode !== 'undefined') {
@@ -210,11 +214,13 @@ }
}
async function createProjectService(
- folder: string,
+ projectConfig: ProjectConfig,
connection: Connection,
params: InitializeParams,
- documentService: DocumentService
+ documentService: DocumentService,
+ updateCapabilities: () => void
): Promise<ProjectService> {
+ const folder = projectConfig.folder
const disposables: Disposable[] = []
const documentSettingsCache: Map<string, Settings> = new Map()
@@ -258,8 +264,6 @@ return connection.sendRequest('@/tailwindCSS/getDocumentSymbols', { uri })
},
},
}
-
- let registrations: Promise<BulkUnregistration>
let chokidarWatcher: chokidar.FSWatcher
let ignore = state.editor.globalSettings.tailwindCSS.files?.exclude ?? DEFAULT_FILES_EXCLUDE
@@ -311,15 +315,6 @@ }
}
if (params.capabilities.workspace?.didChangeWatchedFiles?.dynamicRegistration) {
- connection.onDidChangeWatchedFiles(({ changes }) => {
- onFileEvents(
- changes.map(({ uri, type }) => ({
- file: URI.parse(uri).fsPath,
- type,
- }))
- )
- })
-
connection.client.register(DidChangeWatchedFilesNotification.type, {
watchers: [{ globPattern: `**/${CONFIG_FILE_GLOB}` }, { globPattern: `**/${PACKAGE_GLOB}` }],
})
@@ -376,38 +371,6 @@ },
})
}
- function registerCapabilities(watchFiles: string[] = []): void {
- if (supportsDynamicRegistration(connection, params)) {
- if (registrations) {
- registrations.then((r) => r.dispose())
- }
-
- let capabilities = BulkRegistration.create()
-
- capabilities.add(HoverRequest.type, {
- documentSelector: null,
- })
- capabilities.add(DocumentColorRequest.type, {
- documentSelector: null,
- })
- capabilities.add(CodeActionRequest.type, {
- documentSelector: null,
- })
- capabilities.add(CompletionRequest.type, {
- documentSelector: null,
- resolveProvider: true,
- triggerCharacters: [...TRIGGER_CHARACTERS, state.separator].filter(Boolean),
- })
- if (watchFiles.length > 0) {
- capabilities.add(DidChangeWatchedFilesNotification.type, {
- watchers: watchFiles.map((file) => ({ globPattern: file })),
- })
- }
-
- registrations = connection.client.register(capabilities)
- }
- }
-
function resetState(): void {
clearAllDiagnostics(state)
Object.keys(state).forEach((key) => {
@@ -417,7 +380,7 @@ delete state[key]
}
})
state.enabled = false
- registerCapabilities(state.dependencies)
+ updateCapabilities()
}
async function tryInit() {
@@ -452,19 +415,23 @@
async function init() {
clearRequireCache()
- let [configPath] = (
- await glob([`**/${CONFIG_FILE_GLOB}`], {
- cwd: folder,
- ignore: state.editor.globalSettings.tailwindCSS.files?.exclude ?? DEFAULT_FILES_EXCLUDE,
- onlyFiles: true,
- absolute: true,
- suppressErrors: true,
- dot: true,
- concurrency: Math.max(os.cpus().length, 1),
- })
- )
- .sort((a: string, b: string) => a.split('/').length - b.split('/').length)
- .map(path.normalize)
+ let configPath = projectConfig.configPath
+
+ if (!configPath) {
+ configPath = (
+ await glob([`**/${CONFIG_FILE_GLOB}`], {
+ cwd: folder,
+ ignore: state.editor.globalSettings.tailwindCSS.files?.exclude ?? DEFAULT_FILES_EXCLUDE,
+ onlyFiles: true,
+ absolute: true,
+ suppressErrors: true,
+ dot: true,
+ concurrency: Math.max(os.cpus().length, 1),
+ })
+ )
+ .sort((a: string, b: string) => a.split('/').length - b.split('/').length)
+ .map(path.normalize)[0]
+ }
if (!configPath) {
throw new SilentError('No config file found.')
@@ -957,7 +924,7 @@ state.enabled = true
updateAllDiagnostics(state)
- registerCapabilities(state.dependencies)
+ updateCapabilities()
}
return {
@@ -980,12 +947,13 @@ if (state.enabled) {
updateAllDiagnostics(state)
}
if (settings.editor.colorDecorators) {
- registerCapabilities(state.dependencies)
+ updateCapabilities()
} else {
connection.sendNotification('@/tailwindCSS/clearColors')
}
}
},
+ onFileEvents,
async onHover(params: TextDocumentPositionParams): Promise<Hover> {
if (!state.enabled) return null
let document = documentService.getDocument(params.textDocument.uri)
@@ -1002,11 +970,19 @@ if (!document) return null
let settings = await state.editor.getConfiguration(document.uri)
if (!settings.tailwindCSS.suggestions) return null
if (await isExcluded(state, document)) return null
- return doComplete(state, document, params.position, params.context)
+ let result = await doComplete(state, document, params.position, params.context)
+ if (!result) return result
+ return {
+ isIncomplete: result.isIncomplete,
+ items: result.items.map((item) => ({
+ ...item,
+ data: { projectKey: JSON.stringify(projectConfig), originalData: item.data },
+ })),
+ }
},
onCompletionResolve(item: CompletionItem): Promise<CompletionItem> {
if (!state.enabled) return null
- return resolveCompletionItem(state, item)
+ return resolveCompletionItem(state, { ...item, data: item.data?.originalData })
},
async onCodeAction(params: CodeActionParams): Promise<CodeAction[]> {
if (!state.enabled) return null
@@ -1345,6 +1321,7 @@ private workspaces: Map<string, { name: string; workspaceFsPath: string }>
private projects: Map<string, ProjectService>
private documentService: DocumentService
public initializeParams: InitializeParams
+ private registrations: Promise<BulkUnregistration>
constructor(private connection: Connection) {
this.documentService = new DocumentService(this.connection)
@@ -1358,16 +1335,15 @@
this.initialized = true
// TODO
- const workspaceFolders =
+ let workspaceFolders: Array<ProjectConfig> =
false &&
Array.isArray(this.initializeParams.workspaceFolders) &&
this.initializeParams.capabilities.workspace?.workspaceFolders
? this.initializeParams.workspaceFolders.map((el) => ({
- name: el.name,
- fsPath: getFileFsPath(el.uri),
+ folder: getFileFsPath(el.uri),
}))
: this.initializeParams.rootPath
- ? [{ name: '', fsPath: normalizeFileNameToFsPath(this.initializeParams.rootPath) }]
+ ? [{ folder: normalizeFileNameToFsPath(this.initializeParams.rootPath) }]
: []
if (workspaceFolders.length === 0) {
@@ -1375,14 +1351,65 @@ console.error('No workspace folders found, not initializing.')
return
}
+ let configFileOrFiles = dlv(
+ await connection.workspace.getConfiguration('tailwindCSS'),
+ 'experimental.configFile',
+ null
+ ) as Settings['tailwindCSS']['experimental']['configFile']
+
+ if (configFileOrFiles) {
+ let base = workspaceFolders[0].folder
+
+ if (
+ typeof configFileOrFiles !== 'string' &&
+ (!isObject(configFileOrFiles) ||
+ !Object.entries(configFileOrFiles).every(([key, value]) => {
+ if (typeof key !== 'string') return false
+ if (Array.isArray(value)) {
+ return value.every((item) => typeof item === 'string')
+ }
+ return typeof value === 'string'
+ }))
+ ) {
+ console.error('Invalid `experimental.configFile` configuration, not initializing.')
+ return
+ }
+
+ let configFiles =
+ typeof configFileOrFiles === 'string' ? { [configFileOrFiles]: '**' } : configFileOrFiles
+
+ workspaceFolders = Object.entries(configFiles).map(
+ ([relativeConfigPath, relativeDocumentSelectorOrSelectors]) => {
+ return {
+ folder: base,
+ configPath: path.join(base, relativeConfigPath),
+ documentSelector: []
+ .concat(relativeDocumentSelectorOrSelectors)
+ .map((selector) => path.join(base, selector)),
+ }
+ }
+ )
+ }
+
await Promise.all(
- workspaceFolders.map(async (folder) => {
- return this.addProject(folder.fsPath, this.initializeParams)
- })
+ workspaceFolders.map((projectConfig) => this.addProject(projectConfig, this.initializeParams))
)
this.setupLSPHandlers()
+ if (this.initializeParams.capabilities.workspace?.didChangeWatchedFiles?.dynamicRegistration) {
+ this.connection.onDidChangeWatchedFiles(({ changes }) => {
+ for (let [, project] of this.projects) {
+ project.onFileEvents(
+ changes.map(({ uri, type }) => ({
+ file: URI.parse(uri).fsPath,
+ type,
+ }))
+ )
+ }
+ })
+ }
+
this.connection.onDidChangeConfiguration(async ({ settings }) => {
for (let [, project] of this.projects) {
project.onUpdateSettings(settings)
@@ -1394,24 +1421,24 @@ this.dispose()
})
this.documentService.onDidChangeContent((change) => {
- // TODO
- const project = Array.from(this.projects.values())[0]
- project?.provideDiagnostics(change.document)
+ this.getProject(change.document)?.provideDiagnostics(change.document)
})
}
- private async addProject(folder: string, params: InitializeParams): Promise<void> {
- if (this.projects.has(folder)) {
- await this.projects.get(folder).tryInit()
+ private async addProject(projectConfig: ProjectConfig, params: InitializeParams): Promise<void> {
+ let key = JSON.stringify(projectConfig)
+ if (this.projects.has(key)) {
+ await this.projects.get(key).tryInit()
} else {
const project = await createProjectService(
- folder,
+ projectConfig,
this.connection,
params,
- this.documentService
+ this.documentService,
+ () => this.updateCapabilities()
)
+ this.projects.set(key, project)
await project.tryInit()
- this.projects.set(folder, project)
}
}
@@ -1424,38 +1451,78 @@ this.connection.onColorPresentation(this.onColorPresentation.bind(this))
this.connection.onCodeAction(this.onCodeAction.bind(this))
}
+ private updateCapabilities() {
+ if (this.registrations) {
+ this.registrations.then((r) => r.dispose())
+ }
+
+ let projects = Array.from(this.projects.values())
+
+ let capabilities = BulkRegistration.create()
+
+ capabilities.add(HoverRequest.type, { documentSelector: null })
+ capabilities.add(DocumentColorRequest.type, { documentSelector: null })
+ capabilities.add(CodeActionRequest.type, { documentSelector: null })
+
+ capabilities.add(CompletionRequest.type, {
+ documentSelector: null,
+ resolveProvider: true,
+ triggerCharacters: [
+ ...TRIGGER_CHARACTERS,
+ ...projects.map((project) => project.state.separator).filter(Boolean),
+ ].filter(Boolean),
+ })
+
+ capabilities.add(DidChangeWatchedFilesNotification.type, {
+ watchers: projects.flatMap((project) =>
+ project.state.dependencies.map((file) => ({ globPattern: file }))
+ ),
+ })
+
+ this.registrations = this.connection.client.register(capabilities)
+ }
+
+ private getProject(document: TextDocumentIdentifier): ProjectService {
+ let fallbackProject: ProjectService
+ for (let [key, project] of this.projects) {
+ let projectConfig = JSON.parse(key) as ProjectConfig
+ if (projectConfig.configPath) {
+ for (let selector of projectConfig.documentSelector) {
+ if (minimatch(URI.parse(document.uri).fsPath, selector)) {
+ return project
+ }
+ }
+ } else {
+ if (!fallbackProject) {
+ fallbackProject = project
+ }
+ }
+ }
+ return fallbackProject
+ }
+
async onDocumentColor(params: DocumentColorParams): Promise<ColorInformation[]> {
- const project = Array.from(this.projects.values())[0]
- return project?.onDocumentColor(params) ?? []
+ return this.getProject(params.textDocument)?.onDocumentColor(params) ?? []
}
async onColorPresentation(params: ColorPresentationParams): Promise<ColorPresentation[]> {
- const project = Array.from(this.projects.values())[0]
- return project?.onColorPresentation(params) ?? []
+ return this.getProject(params.textDocument)?.onColorPresentation(params) ?? []
}
async onHover(params: TextDocumentPositionParams): Promise<Hover> {
- // TODO
- const project = Array.from(this.projects.values())[0]
- return project?.onHover(params) ?? null
+ return this.getProject(params.textDocument)?.onHover(params) ?? null
}
async onCompletion(params: CompletionParams): Promise<CompletionList> {
- // TODO
- const project = Array.from(this.projects.values())[0]
- return project?.onCompletion(params) ?? null
+ return this.getProject(params.textDocument)?.onCompletion(params) ?? null
}
async onCompletionResolve(item: CompletionItem): Promise<CompletionItem> {
- // TODO
- const project = Array.from(this.projects.values())[0]
- return project?.onCompletionResolve(item) ?? null
+ return this.projects.get(item.data.projectKey)?.onCompletionResolve(item) ?? null
}
onCodeAction(params: CodeActionParams): Promise<CodeAction[]> {
- // TODO
- const project = Array.from(this.projects.values())[0]
- return project?.onCodeAction(params) ?? null
+ return this.getProject(params.textDocument)?.onCodeAction(params) ?? null
}
listen() {
|