Home

tailwind-ctp-intellisense @master - refs - log -
- 
https://git.jolheiser.com/tailwind-ctp-intellisense.git
Tailwind intellisense + Catppuccin
tree log patch
Merge settings with defaults (#605)
Signature
-----BEGIN PGP SIGNATURE----- wsBcBAABCAAQBQJjILBNCRBK7hj4Ov3rIwAA+H0IAJe4vXP/e2RbDViQZRHLtNMp RM1k+glqZ8/o4c8Icbqq1cu8QIoeFq8iipuuTjyfJ1Jcxkzyho++CRWU7JPmoN2o FLxYaoFFS5dmd9f8/OZ3cj0gB3rdBj0xvRS8nn7NZ4dS17cjQGOd0Ba1E2LfO+AK WoXkZ3ysgBl2sODV4XTKLWe57YxFsVSK8bDjDbM/BQzVLhwMf2rRIWA59A9wtVys bY1iwc2YzGc7Seku6Q+ubVSuGt+mZSWJAK7XpgCWR5Uz7Jh/m8pe94E6w1BnB5z2 Bv9t8+ukGO65sy9FcGZ1LAXrPTGef7lkpV/vgynm0uqwpclyiFw3iMAl7yarImA= =KbGK -----END PGP SIGNATURE-----
Brad Cornes <hello@bradley.dev>
2 years ago
12 changed files, 161 additions(+), 155 deletions(-)
package-lock.jsonpackages/tailwindcss-language-server/package.jsonpackages/tailwindcss-language-server/src/server.tspackages/tailwindcss-language-server/src/util/isExcluded.tspackages/tailwindcss-language-service/src/completionProvider.tspackages/tailwindcss-language-service/src/hoverProvider.tspackages/tailwindcss-language-service/src/util/find.tspackages/tailwindcss-language-service/src/util/jit.tspackages/tailwindcss-language-service/src/util/state.tspackages/tailwindcss-language-service/src/util/stringify.tspackages/vscode-tailwindcss/README.mdpackages/vscode-tailwindcss/package.json
M package-lock.json → package-lock.json
  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

diff --git a/package-lock.json b/package-lock.json
index 9bd868f81657860fc1b98e4d5bf6d33e509710eb..214efe53dbd66817a49c34285543a4f169244a78 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,6 +24,7 @@ 				"concurrently": "7.0.0",
 				"css.escape": "1.5.1",
 				"culori": "0.20.1",
 				"debounce": "1.2.0",
+				"deepmerge": "4.2.2",
 				"detect-indent": "6.0.0",
 				"detective": "5.2.0",
 				"dlv": "1.1.3",
@@ -245,9 +246,9 @@ 				"@babel/core": "^7.0.0"
 			}
 		},
 		"node_modules/@babel/helper-define-polyfill-provider": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz",
-			"integrity": "sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg==",
+			"version": "0.3.3",
+			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
+			"integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
 			"dependencies": {
 				"@babel/helper-compilation-targets": "^7.17.7",
 				"@babel/helper-plugin-utils": "^7.16.7",
@@ -1594,11 +1595,11 @@ 				"@babel/core": "^7.0.0-0"
 			}
 		},
 		"node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-regenerator": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz",
-			"integrity": "sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw==",
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
+			"integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
 			"dependencies": {
-				"@babel/helper-define-polyfill-provider": "^0.3.2"
+				"@babel/helper-define-polyfill-provider": "^0.3.3"
 			},
 			"peerDependencies": {
 				"@babel/core": "^7.0.0-0"
@@ -5383,9 +5384,9 @@ 			"integrity": "sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY=",
 			"dev": true
 		},
 		"node_modules/autoprefixer": {
-			"version": "10.4.9",
-			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.9.tgz",
-			"integrity": "sha512-Uu67eduPEmOeA0vyJby5ghu1AAELCCNSsLAjK+lz6kYzNM5sqnBO36MqfsjhPjQF/BaJM5U/UuFYyl7PavY/wQ==",
+			"version": "10.4.10",
+			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.10.tgz",
+			"integrity": "sha512-nMaiDARyp1e74c8IeAXkr+BmFKa8By4Zak7tyaNPF09Iu39WFpNXOWrVirmXjKr+5cOyERwvtbMOLYz6iBJYgQ==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -5399,7 +5400,7 @@ 			],
 			"peer": true,
 			"dependencies": {
 				"browserslist": "^4.21.3",
-				"caniuse-lite": "^1.0.30001394",
+				"caniuse-lite": "^1.0.30001399",
 				"fraction.js": "^4.2.0",
 				"normalize-range": "^0.1.2",
 				"picocolors": "^1.0.0",
@@ -5665,12 +5666,12 @@ 				"node": ">=4"
 			}
 		},
 		"node_modules/babel-plugin-polyfill-corejs2": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz",
-			"integrity": "sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q==",
+			"version": "0.3.3",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
+			"integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
 			"dependencies": {
 				"@babel/compat-data": "^7.17.7",
-				"@babel/helper-define-polyfill-provider": "^0.3.2",
+				"@babel/helper-define-polyfill-provider": "^0.3.3",
 				"semver": "^6.1.1"
 			},
 			"peerDependencies": {
@@ -6147,9 +6148,9 @@ 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/caniuse-lite": {
-			"version": "1.0.30001397",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001397.tgz",
-			"integrity": "sha512-SW9N2TbCdLf0eiNDRrrQXx2sOkaakNZbCjgNpPyMJJbiOrU5QzMIrXOVMRM1myBXTD5iTkdrtU/EguCrBocHlA==",
+			"version": "1.0.30001399",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001399.tgz",
+			"integrity": "sha512-4vQ90tMKS+FkvuVWS5/QY1+d805ODxZiKFzsU8o/RsVJz49ZSRR8EjykLJbqhzdPgadbX6wB538wOzle3JniRA==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -7363,9 +7364,9 @@ 				"whatwg-url": "^7.0.0"
 			}
 		},
 		"node_modules/date-fns": {
-			"version": "2.29.2",
-			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.2.tgz",
-			"integrity": "sha512-0VNbwmWJDS/G3ySwFSJA3ayhbURMTJLtwM2DTxf9CWondCnh6DTNlO9JgRSq6ibf4eD0lfMJNBxUdEAHHix+bA==",
+			"version": "2.29.3",
+			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz",
+			"integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==",
 			"engines": {
 				"node": ">=0.11"
 			},
@@ -7755,9 +7756,9 @@ 				"safer-buffer": "^2.1.0"
 			}
 		},
 		"node_modules/electron-to-chromium": {
-			"version": "1.4.247",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.247.tgz",
-			"integrity": "sha512-FLs6R4FQE+1JHM0hh3sfdxnYjKvJpHZyhQDjc2qFq/xFvmmRt/TATNToZhrcGUFzpF2XjeiuozrA8lI0PZmYYw=="
+			"version": "1.4.248",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.248.tgz",
+			"integrity": "sha512-qShjzEYpa57NnhbW2K+g+Fl+eNoDvQ7I+2MRwWnU6Z6F0HhXekzsECCLv+y2OJUsRodjqoSfwHkIX42VUFtUzg=="
 		},
 		"node_modules/emoji-regex": {
 			"version": "9.2.2",
@@ -19972,9 +19973,9 @@ 				"yarn": "*"
 			}
 		},
 		"node_modules/update-browserslist-db": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.7.tgz",
-			"integrity": "sha512-iN/XYesmZ2RmmWAiI4Z5rq0YqSiv0brj9Ce9CfhNE4xIW2h+MFxcgkxIzZ+ShkFPUkjU3gQ+3oypadD3RAMtrg==",
+			"version": "1.0.9",
+			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
+			"integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -21032,9 +21033,9 @@ 				"regexpu-core": "^5.1.0"
 			}
 		},
 		"@babel/helper-define-polyfill-provider": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz",
-			"integrity": "sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg==",
+			"version": "0.3.3",
+			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
+			"integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
 			"requires": {
 				"@babel/helper-compilation-targets": "^7.17.7",
 				"@babel/helper-plugin-utils": "^7.16.7",
@@ -21935,11 +21936,11 @@ 				"semver": "^6.3.0"
 			},
 			"dependencies": {
 				"babel-plugin-polyfill-regenerator": {
-					"version": "0.4.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz",
-					"integrity": "sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw==",
+					"version": "0.4.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
+					"integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
 					"requires": {
-						"@babel/helper-define-polyfill-provider": "^0.3.2"
+						"@babel/helper-define-polyfill-provider": "^0.3.3"
 					}
 				},
 				"semver": {
@@ -25022,13 +25023,13 @@ 			"integrity": "sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY=",
 			"dev": true
 		},
 		"autoprefixer": {
-			"version": "10.4.9",
-			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.9.tgz",
-			"integrity": "sha512-Uu67eduPEmOeA0vyJby5ghu1AAELCCNSsLAjK+lz6kYzNM5sqnBO36MqfsjhPjQF/BaJM5U/UuFYyl7PavY/wQ==",
+			"version": "10.4.10",
+			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.10.tgz",
+			"integrity": "sha512-nMaiDARyp1e74c8IeAXkr+BmFKa8By4Zak7tyaNPF09Iu39WFpNXOWrVirmXjKr+5cOyERwvtbMOLYz6iBJYgQ==",
 			"peer": true,
 			"requires": {
 				"browserslist": "^4.21.3",
-				"caniuse-lite": "^1.0.30001394",
+				"caniuse-lite": "^1.0.30001399",
 				"fraction.js": "^4.2.0",
 				"normalize-range": "^0.1.2",
 				"picocolors": "^1.0.0",
@@ -25229,12 +25230,12 @@ 				}
 			}
 		},
 		"babel-plugin-polyfill-corejs2": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz",
-			"integrity": "sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q==",
+			"version": "0.3.3",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
+			"integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
 			"requires": {
 				"@babel/compat-data": "^7.17.7",
-				"@babel/helper-define-polyfill-provider": "^0.3.2",
+				"@babel/helper-define-polyfill-provider": "^0.3.3",
 				"semver": "^6.1.1"
 			},
 			"dependencies": {
@@ -25613,9 +25614,9 @@ 				"quick-lru": "^4.0.1"
 			}
 		},
 		"caniuse-lite": {
-			"version": "1.0.30001397",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001397.tgz",
-			"integrity": "sha512-SW9N2TbCdLf0eiNDRrrQXx2sOkaakNZbCjgNpPyMJJbiOrU5QzMIrXOVMRM1myBXTD5iTkdrtU/EguCrBocHlA=="
+			"version": "1.0.30001399",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001399.tgz",
+			"integrity": "sha512-4vQ90tMKS+FkvuVWS5/QY1+d805ODxZiKFzsU8o/RsVJz49ZSRR8EjykLJbqhzdPgadbX6wB538wOzle3JniRA=="
 		},
 		"capture-exit": {
 			"version": "2.0.0",
@@ -26570,9 +26571,9 @@ 				"whatwg-url": "^7.0.0"
 			}
 		},
 		"date-fns": {
-			"version": "2.29.2",
-			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.2.tgz",
-			"integrity": "sha512-0VNbwmWJDS/G3ySwFSJA3ayhbURMTJLtwM2DTxf9CWondCnh6DTNlO9JgRSq6ibf4eD0lfMJNBxUdEAHHix+bA=="
+			"version": "2.29.3",
+			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz",
+			"integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA=="
 		},
 		"dateformat": {
 			"version": "3.0.3",
@@ -26872,9 +26873,9 @@ 				"safer-buffer": "^2.1.0"
 			}
 		},
 		"electron-to-chromium": {
-			"version": "1.4.247",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.247.tgz",
-			"integrity": "sha512-FLs6R4FQE+1JHM0hh3sfdxnYjKvJpHZyhQDjc2qFq/xFvmmRt/TATNToZhrcGUFzpF2XjeiuozrA8lI0PZmYYw=="
+			"version": "1.4.248",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.248.tgz",
+			"integrity": "sha512-qShjzEYpa57NnhbW2K+g+Fl+eNoDvQ7I+2MRwWnU6Z6F0HhXekzsECCLv+y2OJUsRodjqoSfwHkIX42VUFtUzg=="
 		},
 		"emoji-regex": {
 			"version": "9.2.2",
@@ -36312,9 +36313,9 @@ 			"integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
 			"dev": true
 		},
 		"update-browserslist-db": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.7.tgz",
-			"integrity": "sha512-iN/XYesmZ2RmmWAiI4Z5rq0YqSiv0brj9Ce9CfhNE4xIW2h+MFxcgkxIzZ+ShkFPUkjU3gQ+3oypadD3RAMtrg==",
+			"version": "1.0.9",
+			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
+			"integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
 			"requires": {
 				"escalade": "^3.1.1",
 				"picocolors": "^1.0.0"
M packages/tailwindcss-language-server/package.json → packages/tailwindcss-language-server/package.json
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12

diff --git a/packages/tailwindcss-language-server/package.json b/packages/tailwindcss-language-server/package.json
index 14fb8f0a6d8dadf63ca4ec36d159f1dfb7583385..ea88ca480140240dc47b54055f1bc0970fe0aa44 100644
--- a/packages/tailwindcss-language-server/package.json
+++ b/packages/tailwindcss-language-server/package.json
@@ -44,6 +44,7 @@     "chokidar": "3.5.1",
     "color-name": "1.1.4",
     "culori": "0.20.1",
     "debounce": "1.2.0",
+    "deepmerge": "4.2.2",
     "detective": "5.2.0",
     "dlv": "1.1.3",
     "dset": "3.1.2",
M packages/tailwindcss-language-server/src/server.ts → packages/tailwindcss-language-server/src/server.ts
 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

diff --git a/packages/tailwindcss-language-server/src/server.ts b/packages/tailwindcss-language-server/src/server.ts
index 52db05936e4fb0d127538ec3fd37e17a0a8d362c..a1355ff73bf383dd6f404a1cd56866925d0aa3b2 100644
--- a/packages/tailwindcss-language-server/src/server.ts
+++ b/packages/tailwindcss-language-server/src/server.ts
@@ -78,10 +78,11 @@ import { getColor } from 'tailwindcss-language-service/src/util/color'
 import * as culori from 'culori'
 import namedColors from 'color-name'
 import tailwindPlugins from './lib/plugins'
-import isExcluded, { DEFAULT_FILES_EXCLUDE } from './util/isExcluded'
+import isExcluded from './util/isExcluded'
 import { getFileFsPath, normalizeFileNameToFsPath } from './util/uri'
 import { equal } from 'tailwindcss-language-service/src/util/array'
 import preflight from 'tailwindcss/lib/css/preflight.css'
+import merge from 'deepmerge'
 
 // @ts-ignore
 global.__preflight = preflight
@@ -238,7 +239,42 @@         section: 'tailwindCSS',
         scopeUri: uri,
       }),
     ])
-    let config: Settings = { editor, tailwindCSS }
+    editor = isObject(editor) ? editor : {}
+    tailwindCSS = isObject(tailwindCSS) ? tailwindCSS : {}
+
+    let config: Settings = merge<Settings>(
+      {
+        editor: { tabSize: 2 },
+        tailwindCSS: {
+          emmetCompletions: false,
+          classAttributes: ['class', 'className', 'ngClass'],
+          codeActions: true,
+          hovers: true,
+          suggestions: true,
+          validate: true,
+          colorDecorators: true,
+          rootFontSize: 16,
+          lint: {
+            cssConflict: 'warning',
+            invalidApply: 'error',
+            invalidScreen: 'error',
+            invalidVariant: 'error',
+            invalidConfigPath: 'error',
+            invalidTailwindDirective: 'error',
+            recommendedVariantOrder: 'warning',
+          },
+          showPixelEquivalents: true,
+          includeLanguages: {},
+          files: { exclude: ['**/.git/**', '**/node_modules/**', '**/.hg/**', '**/.svn/**'] },
+          experimental: {
+            classRegex: [],
+            configFile: null,
+          },
+        },
+      },
+      { editor, tailwindCSS },
+      { arrayMerge: (_destinationArray, sourceArray, _options) => sourceArray }
+    )
     documentSettingsCache.set(uri, config)
     return config
   }
@@ -266,7 +302,7 @@     },
   }
 
   let chokidarWatcher: chokidar.FSWatcher
-  let ignore = state.editor.globalSettings.tailwindCSS.files?.exclude ?? DEFAULT_FILES_EXCLUDE
+  let ignore = state.editor.globalSettings.tailwindCSS.files.exclude
 
   function onFileEvents(changes: Array<{ file: string; type: FileChangeType }>): void {
     let needsInit = false
@@ -421,7 +457,7 @@     if (!configPath) {
       configPath = (
         await glob([`**/${CONFIG_FILE_GLOB}`], {
           cwd: folder,
-          ignore: state.editor.globalSettings.tailwindCSS.files?.exclude ?? DEFAULT_FILES_EXCLUDE,
+          ignore: state.editor.globalSettings.tailwindCSS.files.exclude,
           onlyFiles: true,
           absolute: true,
           suppressErrors: true,
@@ -937,10 +973,9 @@       }
     },
     async onUpdateSettings(settings: any): Promise<void> {
       documentSettingsCache.clear()
-      let previousExclude =
-        state.editor.globalSettings.tailwindCSS.files?.exclude ?? DEFAULT_FILES_EXCLUDE
+      let previousExclude = state.editor.globalSettings.tailwindCSS.files.exclude
       state.editor.globalSettings = await state.editor.getConfiguration()
-      if (!equal(previousExclude, settings.tailwindCSS.files?.exclude ?? DEFAULT_FILES_EXCLUDE)) {
+      if (!equal(previousExclude, settings.tailwindCSS.files.exclude)) {
         tryInit()
       } else {
         if (state.enabled) {
M packages/tailwindcss-language-server/src/util/isExcluded.ts → packages/tailwindcss-language-server/src/util/isExcluded.ts
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19

diff --git a/packages/tailwindcss-language-server/src/util/isExcluded.ts b/packages/tailwindcss-language-server/src/util/isExcluded.ts
index 62d1f9e43779c58623bcf0971e2ee4d35cc067a3..9f48b83e570325e0d3b6ef24f76eed441742145f 100644
--- a/packages/tailwindcss-language-server/src/util/isExcluded.ts
+++ b/packages/tailwindcss-language-server/src/util/isExcluded.ts
@@ -4,13 +4,11 @@ import { State } from 'tailwindcss-language-service/src/util/state'
 import { TextDocument } from 'vscode-languageserver-textdocument'
 import { getFileFsPath } from './uri'
 
-export const DEFAULT_FILES_EXCLUDE = ['**/.git/**', '**/.svn/**', '**/.hg/**', '**/node_modules/**']
-
 export default async function isExcluded(state: State, document: TextDocument): Promise<boolean> {
   let settings = await state.editor.getConfiguration(document.uri)
   let file = getFileFsPath(document.uri)
 
-  for (let pattern of settings.tailwindCSS.files?.exclude ?? DEFAULT_FILES_EXCLUDE) {
+  for (let pattern of settings.tailwindCSS.files.exclude) {
     if (minimatch(file, path.join(state.editor.folder, pattern))) {
       return true
     }
M packages/tailwindcss-language-service/src/completionProvider.ts → packages/tailwindcss-language-service/src/completionProvider.ts
 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

diff --git a/packages/tailwindcss-language-service/src/completionProvider.ts b/packages/tailwindcss-language-service/src/completionProvider.ts
index 5be8c6020ab864c36f03f337a589071eb7660c9b..8ac58761c1f1eb7c0b6f2cf6f38cf0eddaef183d 100644
--- a/packages/tailwindcss-language-service/src/completionProvider.ts
+++ b/packages/tailwindcss-language-service/src/completionProvider.ts
@@ -1,4 +1,4 @@
-import { State } from './util/state'
+import { Settings, State } from './util/state'
 import type {
   CompletionItem,
   CompletionItemKind,
@@ -400,7 +400,7 @@   document: TextDocument,
   position: Position
 ): Promise<CompletionList> {
   const settings = await state.editor.getConfiguration(document.uri)
-  const regexes = dlv(settings, 'tailwindCSS.experimental.classRegex', [])
+  const regexes = settings.tailwindCSS.experimental.classRegex
   if (regexes.length === 0) return null
 
   const positionOffset = document.offsetAt(position)
@@ -1109,11 +1109,7 @@   } else {
     item.detail = await getCssDetail(state, className)
     if (!item.documentation) {
       const settings = await state.editor.getConfiguration()
-      const css = stringifyCss(item.data.join(':'), className, {
-        tabSize: dlv(settings, 'editor.tabSize', 2),
-        showPixelEquivalents: dlv(settings, 'tailwindCSS.showPixelEquivalents', true),
-        rootFontSize: dlv(settings, 'tailwindCSS.rootFontSize', 16),
-      })
+      const css = stringifyCss(item.data.join(':'), className, settings)
       if (css) {
         item.documentation = {
           kind: 'markdown' as typeof MarkupKind.Markdown,
@@ -1141,13 +1137,7 @@
   return isObject(item.__info) && !item.__info.__rule
 }
 
-function stringifyDecls(
-  obj: any,
-  {
-    showPixelEquivalents = false,
-    rootFontSize = 16,
-  }: Partial<{ showPixelEquivalents: boolean; rootFontSize: number }> = {}
-): string {
+function stringifyDecls(obj: any, settings: Settings): string {
   let props = Object.keys(obj)
   let nonCustomProps = props.filter((prop) => !prop.startsWith('--'))
 
@@ -1159,7 +1149,9 @@   return props
     .map((prop) =>
       ensureArray(obj[prop])
         .map((value) => {
-          const px = showPixelEquivalents ? remToPx(value, rootFontSize) : undefined
+          const px = settings.tailwindCSS.showPixelEquivalents
+            ? remToPx(value, settings.tailwindCSS.rootFontSize)
+            : undefined
           return `${prop}: ${value}${px ? `/* ${px} */` : ''};`
         })
         .join(' ')
@@ -1173,10 +1165,7 @@     return `${className.length} rules`
   }
   if (className.__rule === true) {
     const settings = await state.editor.getConfiguration()
-    return stringifyDecls(removeMeta(className), {
-      showPixelEquivalents: dlv(settings, 'tailwindCSS.showPixelEquivalents', true),
-      rootFontSize: dlv(settings, 'tailwindCSS.rootFontSize', 16),
-    })
+    return stringifyDecls(removeMeta(className), settings)
   }
   return null
 }
M packages/tailwindcss-language-service/src/hoverProvider.ts → packages/tailwindcss-language-service/src/hoverProvider.ts
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17

diff --git a/packages/tailwindcss-language-service/src/hoverProvider.ts b/packages/tailwindcss-language-service/src/hoverProvider.ts
index 5ea1fcb6686d97eb0b8dd71b06f91f5960662a98..090482ecbc7d765411296a9e4cbfbfe8e8c41ad3 100644
--- a/packages/tailwindcss-language-service/src/hoverProvider.ts
+++ b/packages/tailwindcss-language-service/src/hoverProvider.ts
@@ -106,11 +106,7 @@
   const css = stringifyCss(
     className.className,
     dlv(state.classNames.classNames, [...parts, '__info']),
-    {
-      tabSize: dlv(settings, 'editor.tabSize', 2),
-      showPixelEquivalents: dlv(settings, 'tailwindCSS.showPixelEquivalents', true),
-      rootFontSize: dlv(settings, 'tailwindCSS.rootFontSize', 16),
-    }
+    settings
   )
 
   if (!css) return null
M packages/tailwindcss-language-service/src/util/find.ts → packages/tailwindcss-language-service/src/util/find.ts
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13

diff --git a/packages/tailwindcss-language-service/src/util/find.ts b/packages/tailwindcss-language-service/src/util/find.ts
index 5b70d7af2877a05df4af49cf33792d934ab51910..4e851158c1020139e6cc73d0214cc21127e1fe02 100644
--- a/packages/tailwindcss-language-service/src/util/find.ts
+++ b/packages/tailwindcss-language-service/src/util/find.ts
@@ -124,7 +124,7 @@   doc: TextDocument,
   range?: Range
 ): Promise<DocumentClassList[]> {
   const settings = await state.editor.getConfiguration(doc.uri)
-  const regexes = dlv(settings, 'tailwindCSS.experimental.classRegex', [])
+  const regexes = settings.tailwindCSS.experimental.classRegex
 
   if (!Array.isArray(regexes) || regexes.length === 0) return []
M packages/tailwindcss-language-service/src/util/jit.ts → packages/tailwindcss-language-service/src/util/jit.ts
 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

diff --git a/packages/tailwindcss-language-service/src/util/jit.ts b/packages/tailwindcss-language-service/src/util/jit.ts
index 27153b1b9b372274470b90584e9c7926982553b9..d308960b288fb9af3fb053feb1fa5adbc1dcbe7f 100644
--- a/packages/tailwindcss-language-service/src/util/jit.ts
+++ b/packages/tailwindcss-language-service/src/util/jit.ts
@@ -29,19 +29,15 @@ }
 
 export async function stringifyRoot(state: State, root: Root, uri?: string): Promise<string> {
   let settings = await state.editor.getConfiguration(uri)
-  let tabSize = dlv(settings, 'editor.tabSize', 2)
-  let showPixelEquivalents = dlv(settings, 'tailwindCSS.showPixelEquivalents', true)
-  let rootFontSize = dlv(settings, 'tailwindCSS.rootFontSize', 16)
-
   let clone = root.clone()
 
   clone.walkAtRules('defaults', (node) => {
     node.remove()
   })
 
-  if (showPixelEquivalents) {
+  if (settings.tailwindCSS.showPixelEquivalents) {
     clone.walkDecls((decl) => {
-      let px = remToPx(decl.value, rootFontSize)
+      let px = remToPx(decl.value, settings.tailwindCSS.rootFontSize)
       if (px) {
         decl.value = `${decl.value}/* ${px} */`
       }
@@ -51,7 +47,9 @@
   return clone
     .toString()
     .replace(/([^;{}\s])(\n\s*})/g, (_match, before, after) => `${before};${after}`)
-    .replace(/^(?:    )+/gm, (indent: string) => ' '.repeat((indent.length / 4) * tabSize))
+    .replace(/^(?:    )+/gm, (indent: string) =>
+      ' '.repeat((indent.length / 4) * settings.editor.tabSize)
+    )
 }
 
 export function stringifyRules(state: State, rules: Rule[], tabSize: number = 2): string {
@@ -63,12 +61,12 @@ }
 
 export async function stringifyDecls(state: State, rule: Rule, uri?: string): Promise<string> {
   let settings = await state.editor.getConfiguration(uri)
-  let showPixelEquivalents = dlv(settings, 'tailwindCSS.showPixelEquivalents', true)
-  let rootFontSize = dlv(settings, 'tailwindCSS.rootFontSize', 16)
 
   let result = []
   rule.walkDecls(({ prop, value }) => {
-    let px = showPixelEquivalents ? remToPx(value, rootFontSize) : undefined
+    let px = settings.tailwindCSS.showPixelEquivalents
+      ? remToPx(value, settings.tailwindCSS.rootFontSize)
+      : undefined
     result.push(`${prop}: ${value}${px ? `/* ${px} */` : ''};`)
   })
   return result.join(' ')
M packages/tailwindcss-language-service/src/util/state.ts → packages/tailwindcss-language-service/src/util/state.ts
 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

diff --git a/packages/tailwindcss-language-service/src/util/state.ts b/packages/tailwindcss-language-service/src/util/state.ts
index ff34d5bdc86411955799aec4780c19c23c8f12e3..d699ffb6c83f4b694966ceb8444c872c383a283e 100644
--- a/packages/tailwindcss-language-service/src/util/state.ts
+++ b/packages/tailwindcss-language-service/src/util/state.ts
@@ -33,38 +33,42 @@ }
 
 type DiagnosticSeveritySetting = 'ignore' | 'warning' | 'error'
 
-export type Settings = {
-  editor: {
-    tabSize: number
+export type EditorSettings = {
+  tabSize: number
+}
+
+export type TailwindCssSettings = {
+  emmetCompletions: boolean
+  includeLanguages: Record<string, string>
+  classAttributes: string[]
+  suggestions: boolean
+  hovers: boolean
+  codeActions: boolean
+  validate: boolean
+  showPixelEquivalents: boolean
+  rootFontSize: number
+  colorDecorators: boolean
+  lint: {
+    cssConflict: DiagnosticSeveritySetting
+    invalidApply: DiagnosticSeveritySetting
+    invalidScreen: DiagnosticSeveritySetting
+    invalidVariant: DiagnosticSeveritySetting
+    invalidConfigPath: DiagnosticSeveritySetting
+    invalidTailwindDirective: DiagnosticSeveritySetting
+    recommendedVariantOrder: DiagnosticSeveritySetting
   }
-  tailwindCSS: {
-    emmetCompletions: boolean
-    includeLanguages: Record<string, string>
-    classAttributes: string[]
-    suggestions: boolean
-    hovers: boolean
-    codeActions: boolean
-    validate: boolean
-    showPixelEquivalents: boolean
-    rootFontSize: number
-    colorDecorators: boolean
-    lint: {
-      cssConflict: DiagnosticSeveritySetting
-      invalidApply: DiagnosticSeveritySetting
-      invalidScreen: DiagnosticSeveritySetting
-      invalidVariant: DiagnosticSeveritySetting
-      invalidConfigPath: DiagnosticSeveritySetting
-      invalidTailwindDirective: DiagnosticSeveritySetting
-      recommendedVariantOrder: DiagnosticSeveritySetting
-    }
-    experimental: {
-      classRegex: string[]
-      configFile: string | Record<string, string | string[]>
-    }
-    files: {
-      exclude: string[]
-    }
+  experimental: {
+    classRegex: string[]
+    configFile: string | Record<string, string | string[]>
   }
+  files: {
+    exclude: string[]
+  }
+}
+
+export type Settings = {
+  editor: EditorSettings
+  tailwindCSS: TailwindCssSettings
 }
 
 export interface FeatureFlags {
M packages/tailwindcss-language-service/src/util/stringify.ts → packages/tailwindcss-language-service/src/util/stringify.ts
 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

diff --git a/packages/tailwindcss-language-service/src/util/stringify.ts b/packages/tailwindcss-language-service/src/util/stringify.ts
index 443d1adb508dc1f8fa549db0068c3bc039e924e4..59a0e7b2c5a2b3ced4f6079a95418491a6b83434 100644
--- a/packages/tailwindcss-language-service/src/util/stringify.ts
+++ b/packages/tailwindcss-language-service/src/util/stringify.ts
@@ -5,6 +5,7 @@ import { ensureArray } from './array'
 import { remToPx } from './remToPx'
 import stringifyObject from 'stringify-object'
 import isObject from './isObject'
+import { Settings } from './state'
 
 export function stringifyConfigValue(x: any): string {
   if (isObject(x)) return `${Object.keys(x).length} values`
@@ -21,37 +22,17 @@     },
   })
 }
 
-export function stringifyCss(
-  className: string,
-  obj: any,
-  {
-    tabSize = 2,
-    showPixelEquivalents = false,
-    rootFontSize = 16,
-  }: Partial<{
-    tabSize: number
-    showPixelEquivalents: boolean
-    rootFontSize: number
-  }> = {}
-): string {
+export function stringifyCss(className: string, obj: any, settings: Settings): string {
   if (obj.__rule !== true && !Array.isArray(obj)) return null
 
   if (Array.isArray(obj)) {
-    const rules = obj
-      .map((x) =>
-        stringifyCss(className, x, {
-          tabSize,
-          showPixelEquivalents,
-          rootFontSize,
-        })
-      )
-      .filter(Boolean)
+    const rules = obj.map((x) => stringifyCss(className, x, settings)).filter(Boolean)
     if (rules.length === 0) return null
     return rules.join('\n\n')
   }
 
   let css = ``
-  const indent = ' '.repeat(tabSize)
+  const indent = ' '.repeat(settings.editor.tabSize)
 
   const context = dlv(obj, '__context', [])
   const props = Object.keys(removeMeta(obj))
@@ -65,7 +46,9 @@   const indentStr = indent.repeat(context.length)
   const decls = props.reduce((acc, curr, i) => {
     const propStr = ensureArray(obj[curr])
       .map((val) => {
-        const px = showPixelEquivalents ? remToPx(val, rootFontSize) : undefined
+        const px = settings.tailwindCSS.showPixelEquivalents
+          ? remToPx(val, settings.tailwindCSS.rootFontSize)
+          : undefined
         return `${indentStr + indent}${curr}: ${val}${px ? `/* ${px} */` : ''};`
       })
       .join('\n')
M packages/vscode-tailwindcss/README.md → packages/vscode-tailwindcss/README.md
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13

diff --git a/packages/vscode-tailwindcss/README.md b/packages/vscode-tailwindcss/README.md
index 3a2eb4c50fcc1da0ebd32a9929025ab5a7dc80cf..8c758865cde8b8f98f13d7cc74be6907be2af112 100644
--- a/packages/vscode-tailwindcss/README.md
+++ b/packages/vscode-tailwindcss/README.md
@@ -70,7 +70,7 @@ ```
 
 ### `tailwindCSS.files.exclude`
 
-Configure glob patterns to exclude from all IntelliSense features. Inherits all glob patterns from the `files.exclude` setting. **Default: ["\*\*/.git/\*\*", "\*\*/node_modules/\*\*", "\*\*/.hg/\*\*"]**
+Configure glob patterns to exclude from all IntelliSense features. Inherits all glob patterns from the `files.exclude` setting. **Default: ["\*\*/.git/\*\*", "\*\*/node_modules/\*\*", "\*\*/.hg/\*\*", "\*\*/.svn/\*\*"]**
 
 ### `tailwindCSS.emmetCompletions`
M packages/vscode-tailwindcss/package.json → packages/vscode-tailwindcss/package.json
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14

diff --git a/packages/vscode-tailwindcss/package.json b/packages/vscode-tailwindcss/package.json
index 5f5b6217e25c8f082159e3719fdf6df3fee71403..9d62536457206de71ff125e49ade46c3862e1b70 100755
--- a/packages/vscode-tailwindcss/package.json
+++ b/packages/vscode-tailwindcss/package.json
@@ -150,7 +150,8 @@           },
           "default": [
             "**/.git/**",
             "**/node_modules/**",
-            "**/.hg/**"
+            "**/.hg/**",
+            "**/.svn/**"
           ],
           "markdownDescription": "Configure glob patterns to exclude from all IntelliSense features. Inherits all glob patterns from the `#files.exclude#` setting."
         },