Skip to content

Commit cf764df

Browse files
thecrypticacethecrypticace
committed
Update tests
1 parent 1e1c3e3 commit cf764df

File tree

4 files changed

+52
-45
lines changed

4 files changed

+52
-45
lines changed

‎packages/tailwindcss-language-server/src/project-locator.test.ts

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ testFixture('v4/workspaces', [
123123
'{URL}/packages/admin/**',
124124
'{URL}/packages/admin/app.css',
125125
'{URL}/packages/admin/package.json',
126+
'{URL}/packages/admin/tw.css',
126127
],
127128
},
128129
{
@@ -164,7 +165,7 @@ testLocator({
164165
content: [
165166
'/*',
166167
'/package.json',
167-
'/src/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}',
168+
'/src/**/*.{aspx,astro,cjs,css,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,json,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}',
168169
'/src/components/example.html',
169170
'/src/index.html',
170171
],
@@ -197,7 +198,7 @@ testLocator({
197198
content: [
198199
'/*',
199200
'/package.json',
200-
'/src/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}',
201+
'/src/**/*.{aspx,astro,cjs,css,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,json,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}',
201202
'/src/components/example.html',
202203
'/src/index.html',
203204
],
@@ -245,21 +246,27 @@ testLocator({
245246
content: [
246247
'/*',
247248
'/admin/foo.bin',
248-
'/admin/{**/*.bin,**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}}',
249+
'/admin/tw.css',
250+
'/admin/ui.css',
251+
'/admin/{**/*.bin,**/*.{aspx,astro,bin,cjs,css,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,json,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}}',
249252
'/package.json',
250253
'/shared.html',
251-
'/web/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}',
254+
'/web/**/*.{aspx,astro,bin,cjs,css,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,json,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}',
255+
'/web/app.css',
252256
],
253257
},
254258
{
255259
config: '/web/app.css',
256260
content: [
257261
'/*',
258-
'/admin/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}',
262+
'/admin/**/*.{aspx,astro,bin,cjs,css,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,json,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}',
263+
'/admin/app.css',
264+
'/admin/tw.css',
265+
'/admin/ui.css',
259266
'/package.json',
260267
'/shared.html',
261268
'/web/bar.bin',
262-
'/web/{**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue},*.bin}',
269+
'/web/{**/*.{aspx,astro,bin,cjs,css,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,json,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue},*.bin}',
263270
],
264271
},
265272
],
@@ -291,7 +298,7 @@ testLocator({
291298
'/*',
292299
'/package.json',
293300
'/src/index.html',
294-
'/src/{**/*.html,**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,json,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}}',
301+
'/src/{**/*.html,**/*.{aspx,astro,cjs,css,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,json,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}}',
295302
],
296303
},
297304
],
@@ -301,7 +308,7 @@ testFixture('v4/missing-files', [
301308
//
302309
{
303310
config: 'app.css',
304-
content: ['{URL}/*', '{URL}/package.json'],
311+
content: ['{URL}/*', '{URL}/i-exist.css', '{URL}/package.json'],
305312
},
306313
])
307314

@@ -312,7 +319,8 @@ testFixture('v4/path-mappings', [
312319
content: [
313320
'{URL}/*',
314321
'{URL}/package.json',
315-
'{URL}/src/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}',
322+
'{URL}/src/**/*.{aspx,astro,cjs,css,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,json,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}',
323+
'{URL}/src/a/file.css',
316324
'{URL}/src/a/my-config.ts',
317325
'{URL}/src/a/my-plugin.ts',
318326
'{URL}/tsconfig.json',
@@ -324,7 +332,7 @@ testFixture('v4/invalid-import-order', [
324332
//
325333
{
326334
config: 'tailwind.css',
327-
content: ['{URL}/*', '{URL}/package.json'],
335+
content: ['{URL}/*', '{URL}/a.css', '{URL}/b.css', '{URL}/package.json'],
328336
},
329337
])
330338

‎packages/tailwindcss-language-server/tests/completions/completions.test.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,8 @@ withFixture('v4/basic', (c) => {
313313
let result = await completion({ lang, text, position, settings })
314314
let textEdit = expect.objectContaining({ range: { start: position, end: position } })
315315

316-
expect(result.items.length).toBe(13172)
317-
expect(result.items.filter((item) => item.label.endsWith(':')).length).toBe(317)
316+
expect(result.items.length).toBe(19283)
317+
expect(result.items.filter((item) => item.label.endsWith(':')).length).toBe(346)
318318
expect(result).toEqual({
319319
isIncomplete: false,
320320
items: expect.arrayContaining([
@@ -488,7 +488,7 @@ withFixture('v4/basic', (c) => {
488488
})
489489

490490
// Make sure `@slot` is NOT suggested by default
491-
expect(result.items.length).toBe(7)
491+
expect(result.items.length).toBe(8)
492492
expect(result.items).not.toEqual(
493493
expect.arrayContaining([
494494
expect.objectContaining({ kind: 14, label: '@slot', sortText: '-0000000' }),
@@ -627,7 +627,7 @@ withFixture('v4/basic', (c) => {
627627

628628
expect(resolved).toEqual({
629629
...item,
630-
detail: 'background-color: oklch(0.637 0.237 25.331);',
630+
detail: 'background-color: oklch(63.7% 0.237 25.331);',
631631
documentation: '#fb2c36',
632632
})
633633
})
@@ -692,7 +692,7 @@ defineTest({
692692
// ^
693693
let completion = await document.completions({ line: 0, character: 23 })
694694

695-
expect(completion?.items.length).toBe(12289)
695+
expect(completion?.items.length).toBe(19236)
696696
},
697697
})
698698

@@ -714,7 +714,7 @@ defineTest({
714714
// ^
715715
let completion = await document.completions({ line: 0, character: 22 })
716716

717-
expect(completion?.items.length).toBe(12289)
717+
expect(completion?.items.length).toBe(19236)
718718
},
719719
})
720720

@@ -736,7 +736,7 @@ defineTest({
736736
// ^
737737
let completion = await document.completions({ line: 0, character: 31 })
738738

739-
expect(completion?.items.length).toBe(12289)
739+
expect(completion?.items.length).toBe(19236)
740740
},
741741
})
742742

@@ -765,7 +765,7 @@ defineTest({
765765
// ^
766766
let completion = await document.completions({ line: 0, character: 20 })
767767

768-
expect(completion?.items.length).toBe(12289)
768+
expect(completion?.items.length).toBe(19236)
769769
},
770770
})
771771

@@ -796,7 +796,7 @@ defineTest({
796796
// ^
797797
let completion = await document.completions({ line: 1, character: 22 })
798798

799-
expect(completion?.items.length).toBe(12289)
799+
expect(completion?.items.length).toBe(19236)
800800
},
801801
})
802802

@@ -886,24 +886,24 @@ defineTest({
886886
// ^
887887
let completionA = await document.completions({ line: 0, character: 13 })
888888

889-
expect(completionA?.items.length).toBe(12289)
889+
expect(completionA?.items.length).toBe(19236)
890890

891891
// return <Test className={cn("")} />;
892892
// ^
893893
let completionB = await document.completions({ line: 3, character: 30 })
894894

895-
expect(completionB?.items.length).toBe(12289)
895+
expect(completionB?.items.length).toBe(19236)
896896

897897
// return <Test className={cn("")} />;
898898
// ^
899899
let completionC = await document.completions({ line: 7, character: 30 })
900900

901-
expect(completionC?.items.length).toBe(12289)
901+
expect(completionC?.items.length).toBe(19236)
902902

903903
// let y = cva("");
904904
// ^
905905
let completionD = await document.completions({ line: 10, character: 13 })
906906

907-
expect(completionD?.items.length).toBe(12289)
907+
expect(completionD?.items.length).toBe(19236)
908908
},
909909
})

‎packages/tailwindcss-language-server/tests/env/v4.test.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ defineTest({
2121

2222
expect(await client.project()).toMatchObject({
2323
tailwind: {
24-
version: '4.0.6',
24+
version: '4.1.0',
2525
isDefaultVersion: true,
2626
},
2727
})
@@ -49,7 +49,7 @@ defineTest({
4949
},
5050
})
5151

52-
expect(completion?.items.length).toBe(12288)
52+
expect(completion?.items.length).toBe(19235)
5353
},
5454
})
5555

@@ -137,7 +137,7 @@ defineTest({
137137

138138
expect(await client.project()).toMatchObject({
139139
tailwind: {
140-
version: '4.0.6',
140+
version: '4.1.0',
141141
isDefaultVersion: true,
142142
},
143143
})
@@ -188,7 +188,7 @@ defineTest({
188188
'package.json': json`
189189
{
190190
"dependencies": {
191-
"tailwindcss": "4.0.1"
191+
"tailwindcss": "4.1.0"
192192
}
193193
}
194194
`,
@@ -205,7 +205,7 @@ defineTest({
205205

206206
expect(await client.project()).toMatchObject({
207207
tailwind: {
208-
version: '4.0.1',
208+
version: '4.1.0',
209209
isDefaultVersion: false,
210210
},
211211
})
@@ -233,7 +233,7 @@ defineTest({
233233
},
234234
})
235235

236-
expect(completion?.items.length).toBe(12288)
236+
expect(completion?.items.length).toBe(19235)
237237
},
238238
})
239239

@@ -243,7 +243,7 @@ defineTest({
243243
'package.json': json`
244244
{
245245
"dependencies": {
246-
"tailwindcss": "4.0.1"
246+
"tailwindcss": "4.1.0"
247247
}
248248
}
249249
`,
@@ -270,7 +270,7 @@ defineTest({
270270

271271
expect(await client.project()).toMatchObject({
272272
tailwind: {
273-
version: '4.0.1',
273+
version: '4.1.0',
274274
isDefaultVersion: false,
275275
},
276276
})
@@ -322,7 +322,7 @@ defineTest({
322322

323323
expect(await client.project()).toMatchObject({
324324
tailwind: {
325-
version: '4.0.6',
325+
version: '4.1.0',
326326
isDefaultVersion: true,
327327
},
328328
})
@@ -354,7 +354,7 @@ defineTest({
354354
'package.json': json`
355355
{
356356
"dependencies": {
357-
"tailwindcss": "4.0.1"
357+
"tailwindcss": "4.1.0"
358358
}
359359
}
360360
`,
@@ -831,7 +831,7 @@ defineTest({
831831

832832
expect(await client.project()).toMatchObject({
833833
tailwind: {
834-
version: '4.0.6',
834+
version: '4.1.0',
835835
isDefaultVersion: true,
836836
},
837837
})

‎packages/tailwindcss-language-server/tests/hover/hover.test.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ withFixture('v4/basic', (c) => {
214214
text: '<div class="bg-red-500">',
215215
position: { line: 0, character: 13 },
216216
expected:
217-
'.bg-red-500 {\n background-color: var(--color-red-500) /* oklch(0.637 0.237 25.331) = #fb2c36 */;\n}',
217+
'.bg-red-500 {\n background-color: var(--color-red-500) /* oklch(63.7% 0.237 25.331) = #fb2c36 */;\n}',
218218
expectedRange: {
219219
start: { line: 0, character: 12 },
220220
end: { line: 0, character: 22 },
@@ -231,16 +231,15 @@ withFixture('v4/basic', (c) => {
231231
},
232232
})
233233

234-
test.todo('arbitrary value with theme function')
235-
// testHover('arbitrary value with theme function', {
236-
// text: '<div class="p-[theme(spacing.4)]">',
237-
// position: { line: 0, character: 13 },
238-
// expected: '.p-\\[theme\\(spacing\\.4\\)\\] {\n' + ' padding: 1rem /* 16px */;\n' + '}',
239-
// expectedRange: {
240-
// start: { line: 0, character: 12 },
241-
// end: { line: 0, character: 32 },
242-
// },
243-
// })
234+
testHover('arbitrary value with theme function', {
235+
text: '<div class="p-[theme(spacing.4)]">',
236+
position: { line: 0, character: 13 },
237+
expected: '.p-\\[theme\\(spacing\\.4\\)\\] {\n' + ' padding: 1rem /* 16px */;\n' + '}',
238+
expectedRange: {
239+
start: { line: 0, character: 12 },
240+
end: { line: 0, character: 32 },
241+
},
242+
})
244243

245244
testHover('arbitrary property', {
246245
text: '<div class="[text-wrap:balance]">',

0 commit comments

Comments
 (0)