jolheiser
/
tailwind-ctp-intellisense
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support tailwindcss v2.2

master
Brad Cornes 2021-06-04 12:17:00 +01:00
parent bdb398bf80
commit 4de605928b
7 changed files with 1704 additions and 16272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package-lock.json generated
View File

@ -10,7 +10,7 @@
"@types/debounce": "1.2.0",
"@types/moo": "0.5.3",
"@types/node": "14.14.34",
"@types/vscode": "1.56.0",
"@types/vscode": "1.52.0",
"@vercel/ncc": "0.28.4",
"builtin-modules": "3.2.0",
"chokidar": "3.5.1",
@ -4451,9 +4451,10 @@
"integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw=="
},
"node_modules/@types/vscode": {
"version": "1.56.0",
"resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.56.0.tgz",
"integrity": "sha512-Q5VmQxOx+L1Y6lIJiGcJzwcyV3pQo/eiW8P+7sNLhFI16tJCwtua2DLjHRcpjbCLNVYpQM73kzfFo1Z0HyP9eQ=="
"version": "1.52.0",
"resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.52.0.tgz",
"integrity": "sha512-Kt3bvWzAvvF/WH9YEcrCICDp0Z7aHhJGhLJ1BxeyNP6yRjonWqWnAIh35/pXAjswAnWOABrYlF7SwXR9+1nnLA==",
"license": "MIT"
},
"node_modules/@types/yargs": {
"version": "15.0.13",
@ -23077,9 +23078,9 @@
"integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw=="
},
"@types/vscode": {
"version": "1.56.0",
"resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.56.0.tgz",
"integrity": "sha512-Q5VmQxOx+L1Y6lIJiGcJzwcyV3pQo/eiW8P+7sNLhFI16tJCwtua2DLjHRcpjbCLNVYpQM73kzfFo1Z0HyP9eQ=="
"version": "1.52.0",
"resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.52.0.tgz",
"integrity": "sha512-Kt3bvWzAvvF/WH9YEcrCICDp0Z7aHhJGhLJ1BxeyNP6yRjonWqWnAIh35/pXAjswAnWOABrYlF7SwXR9+1nnLA=="
},
"@types/yargs": {
"version": "15.0.13",

13651
packages/tailwindcss-language-server/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

235
packages/tailwindcss-language-server/src/server.ts
View File

@ -431,21 +431,41 @@ async function createProjectService(
}
try {
featureFlags = __non_webpack_require__(resolveFrom(tailwindDir, './lib/featureFlags.js'))
.default
featureFlags = __non_webpack_require__(
resolveFrom(tailwindDir, './lib/featureFlags.js')
).default
} catch (_) {}
// stubs
let tailwindDirectives = new Set()
let root = postcss.root()
let result = { opts: {}, messages: [] }
try {
let createContext
try {
let createContextFn = __non_webpack_require__(
resolveFrom(configDir, 'tailwindcss/lib/jit/lib/setupContextUtils')
).createContext
createContext = (state) => createContextFn(state.config)
} catch (_) {
// TODO: only for canary releases so can probably remove
let setupContext = __non_webpack_require__(
resolveFrom(configDir, 'tailwindcss/lib/jit/lib/setupContext')
).default
createContext = (state) =>
setupContext(state.configPath, tailwindDirectives)(result, root)
}
jitModules = {
generateRules: {
module: __non_webpack_require__(
resolveFrom(configDir, 'tailwindcss/lib/jit/lib/generateRules')
).generateRules,
},
setupContext: {
module: __non_webpack_require__(
resolveFrom(configDir, 'tailwindcss/lib/jit/lib/setupContext')
).default,
createContext: {
module: createContext,
},
expandApplyAtRules: {
module: __non_webpack_require__(
@ -455,16 +475,18 @@ async function createProjectService(
}
} catch (_) {
try {
let setupContext = __non_webpack_require__(
resolveFrom(configDir, 'tailwindcss/jit/lib/setupContext')
)
jitModules = {
generateRules: {
module: __non_webpack_require__(
resolveFrom(configDir, 'tailwindcss/jit/lib/generateRules')
).generateRules,
},
setupContext: {
module: __non_webpack_require__(
resolveFrom(configDir, 'tailwindcss/jit/lib/setupContext')
),
createContext: {
module: (state) => setupContext(state.configPath, tailwindDirectives)(result, root),
},
expandApplyAtRules: {
module: __non_webpack_require__(
@ -500,6 +522,14 @@ async function createProjectService(
state.featureFlags = featureFlags
state.version = tailwindcssVersion
try {
state.corePlugins = Object.keys(
__non_webpack_require__(
resolveFrom(path.dirname(state.configPath), 'tailwindcss/lib/plugins/index.js')
)
)
} catch (_) {}
if (applyComplexClasses && !applyComplexClasses.default.__patched) {
let _applyComplexClasses = applyComplexClasses.default
applyComplexClasses.default = (config, ...args) => {
@ -572,25 +602,18 @@ async function createProjectService(
const sepLocation = semver.gte(tailwindcss.version, '0.99.0')
? ['separator']
: ['options', 'separator']
let userSeperator: string
let userPurge
let userVariants: any
let userMode: any
let userPlugins: any
let presetModes: any[] = []
let presetVariants: any[] = []
let originalConfig: any
let hook = new Hook(fs.realpathSync(state.configPath), (exports) => {
userSeperator = dlv(exports, sepLocation)
if (typeof userSeperator !== 'string') {
userSeperator = undefined
originalConfig = klona(exports)
let separator = dlv(exports, sepLocation)
if (typeof separator !== 'string') {
separator = ''
}
userPurge = exports.purge
dset(
exports,
sepLocation,
`__TWSEP__${typeof userSeperator === 'undefined' ? ':' : userSeperator}__TWSEP__`
)
dset(exports, sepLocation, `__TWSEP__${separator}__TWSEP__`)
exports.purge = []
let mode: any
@ -606,12 +629,10 @@ async function createProjectService(
if (typeof exports.mode !== 'undefined') {
mode = exports.mode
}
userMode = exports.mode
delete exports.mode
if (state.modules.jit && mode === 'jit') {
state.jit = true
userVariants = exports.variants
exports.variants = []
if (Array.isArray(exports.presets)) {
@ -624,9 +645,16 @@ async function createProjectService(
state.jit = false
}
if (state.corePlugins) {
let corePluginsConfig = {}
for (let pluginName of state.corePlugins) {
corePluginsConfig[pluginName] = true
}
exports.corePlugins = corePluginsConfig
}
// inject JIT `matchUtilities` function
if (Array.isArray(exports.plugins)) {
userPlugins = exports.plugins
exports.plugins = exports.plugins.map((plugin) => {
if (plugin.__isOptionsFunction) {
plugin = plugin()
@ -661,21 +689,22 @@ async function createProjectService(
return exports
})
let config
try {
config = __non_webpack_require__(state.configPath)
__non_webpack_require__(state.configPath)
} catch (error) {
hook.unhook()
throw error
}
if (!originalConfig) {
throw new SilentError(`Failed to load config file: ${state.configPath}`)
}
state.config = resolveConfig.module(originalConfig)
if (state.jit) {
state.jitContext = state.modules.jit.setupContext.module(state.configPath, new Set())(
{ opts: {}, messages: [] },
state.modules.postcss.module.root()
)
state.jitContext.tailwindConfig.separator =
typeof userSeperator === 'undefined' ? ':' : userSeperator
state.jitContext = state.modules.jit.createContext.module(state)
state.jitContext.tailwindConfig.separator = state.config.separator
}
let postcssResult: Result
@ -704,43 +733,6 @@ async function createProjectService(
hook.unhook()
}
if (typeof userSeperator !== 'undefined') {
dset(config, sepLocation, userSeperator)
} else {
deletePropertyPath(config, sepLocation)
}
if (typeof userPurge !== 'undefined') {
config.purge = userPurge
} else {
delete config.purge
}
if (typeof userVariants !== 'undefined') {
config.variants = userVariants
} else {
delete config.variants
}
if (typeof userMode !== 'undefined') {
config.mode = userMode
}
if (typeof userPlugins !== 'undefined') {
config.plugins = userPlugins
}
for (let index in presetModes) {
if (typeof presetModes[index] === 'undefined') {
delete config.presets[index].mode
} else {
config.presets[index].mode = presetModes[index]
}
}
for (let index in presetVariants) {
if (typeof presetVariants[index] === 'undefined') {
delete config.presets[index].variants
} else {
config.presets[index].variants = presetVariants[index]
}
}
if (state.dependencies) {
watcher.unwatch(state.dependencies)
}
@ -749,9 +741,8 @@ async function createProjectService(
state.configId = getConfigId(state.configPath, state.dependencies)
state.config = resolveConfig.module(config)
state.separator = typeof userSeperator === 'string' ? userSeperator : ':'
state.plugins = await getPlugins(config)
state.separator = state.config.separator
state.plugins = await getPlugins(originalConfig)
state.classNames = (await extractClassNames(postcssResult.root)) as ClassNames
state.variants = getVariants(state)
@ -908,8 +899,15 @@ function getVariants(state: State): Record<string, string> {
return dlv(node, 'raws.value', node.value)
}
return Array.from(state.jitContext.variantMap as Map<string, [any, any]>).reduce(
(acc, [variant, [, applyVariant]]) => {
let result = {}
// [name, [sort, fn]]
// [name, [[sort, fn]]]
Array.from(state.jitContext.variantMap as Map<string, [any, any]>).forEach(
([variantName, variantFnOrFns]) => {
let fns = (Array.isArray(variantFnOrFns[0]) ? variantFnOrFns : [variantFnOrFns]).map(
([_sort, fn]) => fn
)
let placeholder = '__variant_placeholder__'
let root = state.modules.postcss.module.root({
@ -947,26 +945,37 @@ function getVariants(state: State): Record<string, string> {
return root
}
applyVariant({
container: root,
separator: state.separator,
modifySelectors,
})
let definitions = []
let definition = root
.toString()
.replace(`.${escape(`${variant}:${placeholder}`)}`, '&')
.replace(/(?<!\\)[{}]/g, '')
.replace(/\s*\n\s*/g, ' ')
.trim()
for (let fn of fns) {
let container = root.clone()
fn({
container,
separator: state.separator,
modifySelectors,
})
return {
...acc,
[variant]: definition.includes(placeholder) ? null : definition,
container.walkDecls((decl) => {
decl.remove()
})
let definition = container
.toString()
.replace(`.${escape(`${variantName}:${placeholder}`)}`, '&')
.replace(/(?<!\\)[{}]/g, '')
.replace(/\s*\n\s*/g, ' ')
.trim()
if (!definition.includes(placeholder)) {
definitions.push(definition)
}
}
},
{}
result[variantName] = definitions.join(', ') || null
}
)
return result
}
let config = state.config
@ -1232,34 +1241,32 @@ function supportsDynamicRegistration(connection: Connection, params: InitializeP
const tw = new TW(connection)
connection.onInitialize(
async (params: InitializeParams): Promise<InitializeResult> => {
tw.initializeParams = params
if (supportsDynamicRegistration(connection, params)) {
return {
capabilities: {
textDocumentSync: TextDocumentSyncKind.Full,
},
}
}
tw.init()
connection.onInitialize(async (params: InitializeParams): Promise<InitializeResult> => {
tw.initializeParams = params
if (supportsDynamicRegistration(connection, params)) {
return {
capabilities: {
textDocumentSync: TextDocumentSyncKind.Full,
hoverProvider: true,
colorProvider: true,
codeActionProvider: true,
completionProvider: {
resolveProvider: true,
triggerCharacters: [...TRIGGER_CHARACTERS, ':'],
},
},
}
}
)
tw.init()
return {
capabilities: {
textDocumentSync: TextDocumentSyncKind.Full,
hoverProvider: true,
colorProvider: true,
codeActionProvider: true,
completionProvider: {
resolveProvider: true,
triggerCharacters: [...TRIGGER_CHARACTERS, ':'],
},
},
}
})
connection.onInitialized(async () => {
await tw.init()

3
packages/tailwindcss-language-service/src/util/state.ts
View File

@ -72,6 +72,7 @@ export interface State {
plugins?: any
screens?: string[]
variants?: Record<string, string | null>
corePlugins?: string[]
modules?: {
tailwindcss?: { version: string; module: any }
postcss?: { version: string; module: Postcss }
@ -79,7 +80,7 @@ export interface State {
resolveConfig?: { module: any }
jit?: {
generateRules: { module: any }
setupContext: { module: any }
createContext: { module: any }
expandApplyAtRules: { module: any }
}
}

1
packages/vscode-tailwindcss/.gitignore vendored
View File

@ -1 +1,2 @@
/dist
/*.vsix

4067
packages/vscode-tailwindcss/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
packages/vscode-tailwindcss/package.json
View File

@ -5,7 +5,7 @@
"preview": true,
"author": "Brad Cornes <hello@bradley.dev>",
"license": "MIT",
"version": "0.6.6",
"version": "0.6.7",
"homepage": "https://github.com/tailwindlabs/tailwindcss-intellisense",
"bugs": {
"url": "https://github.com/tailwindlabs/tailwindcss-intellisense/issues",
@ -196,7 +196,7 @@
},
"devDependencies": {
"@ctrl/tinycolor": "3.1.4",
"@types/vscode": "1.56.0",
"@types/vscode": "1.52.0",
"@vercel/ncc": "0.28.4",
"glob-exec": "0.1.1",
"rimraf": "3.0.2",