diff --git a/packages/tailwindcss-class-names/src/index.js b/packages/tailwindcss-class-names/src/index.js index 4b55f764d6dcd4cc0fcd94de0eb57d01dfdf3a6e..1835e66efab64cbc1e93c7335b0d9cadb7a836b1 100644 --- a/packages/tailwindcss-class-names/src/index.js +++ b/packages/tailwindcss-class-names/src/index.js @@ -12,19 +12,6 @@ import getPlugins from './getPlugins' import getVariants from './getVariants' import resolveConfig from './resolveConfig' import extractClassNames from './extractClassNames.mjs' -import dset from 'dset' - -function TailwindConfigError(error) { - Error.call(this) - Error.captureStackTrace(this, this.constructor) - - this.name = this.constructor.name - this.message = error.message - this.stack = error.stack -} - -util.inherits(TailwindConfigError, Error) -import extractClassNames from './extractClassNames.mjs' import importFrom from 'import-from' function glob(pattern, options = {}) { return new Promise((resolve, reject) => { @@ -87,13 +74,8 @@ return exports }) hook.watch() - let config - try { - config = __non_webpack_require__(configPath) - } catch (error) { -import * as path from 'path' +import getVariants from './getVariants' import chokidar from 'chokidar' - } hook.unwatch() const ast = await postcss([tailwindcss(configPath)]).process( @@ -136,15 +118,10 @@ async function handleChange() { const prevDeps = result ? result.dependencies : [] try { result = await run() - } catch (error) { -import extractClassNames from './extractClassNames.mjs' import getVariants from './getVariants' - onChange({ error }) - } else { +import semver from 'semver' import extractClassNames from './extractClassNames.mjs' - import dlv from 'dlv' -import dset from 'dset' return } if (!arraysEqual(prevDeps, result.dependencies)) { diff --git a/packages/tailwindcss-language-server/src/server.ts b/packages/tailwindcss-language-server/src/server.ts index 349ef7ec9617a4a4823001cd638f0a0bc1690662..729d1f0c30862343cf77f8ab1c278230155392d7 100644 --- a/packages/tailwindcss-language-server/src/server.ts +++ b/packages/tailwindcss-language-server/src/server.ts @@ -63,8 +63,8 @@ const tailwindState = await getTailwindState( params.rootPath || URI.parse(params.rootUri).path, { onChange: (newState: State): void => { +/* -------------------------------------------------------------------------------------------- - TextDocuments, state = { ...newState, enabled: true, editor: editorState } connection.sendNotification('tailwindcss/configUpdated', [ state.configPath, @@ -73,20 +72,6 @@ state.plugins, ]) } else { state = { enabled: false, editor: editorState } - if (newState && newState.error) { - const payload: { - message: string - file?: string - line?: number - } = { message: newState.error.message } - const lines = newState.error.stack.toString().split('\n') - const match = /^(?.*?):(?[0-9]+)$/.exec(lines[0]) - if (match) { - payload.file = match.groups.file - payload.line = parseInt(match.groups.line, 10) - } - connection.sendNotification('tailwindcss/configError', [payload]) - } // TODO // connection.sendNotification('tailwindcss/configUpdated', [null]) } diff --git a/packages/tailwindcss-language-server/src/util/state.ts b/packages/tailwindcss-language-server/src/util/state.ts index d41127d6272e6bbf5b719b96ba602362395c67b9..175dade6ed563cc36605c1fc3c55f5b56e900573 100644 --- a/packages/tailwindcss-language-server/src/util/state.ts +++ b/packages/tailwindcss-language-server/src/util/state.ts @@ -37,7 +37,6 @@ variants?: string[] classNames?: ClassNames dependencies?: string[] editor?: EditorState - error?: Error } export type DocumentClassList = { diff --git a/packages/tailwindcss-vscode/src/extension.ts b/packages/tailwindcss-vscode/src/extension.ts index e27a99c150f0ea8a7edecdec942515657135dd3c..81ca5e142d98ad15c2af1fae7eac4aaf35da44b2 100755 --- a/packages/tailwindcss-vscode/src/extension.ts +++ b/packages/tailwindcss-vscode/src/extension.ts @@ -12,12 +12,12 @@ OutputChannel, WorkspaceFolder, Uri, } from 'vscode' + import { LanguageClient, LanguageClientOptions, TransportKind, } from 'vscode-languageclient' -import { registerConfigErrorHandler } from './lib/registerConfigErrorHandler' let defaultClient: LanguageClient let clients: Map = new Map() @@ -137,10 +137,6 @@ 'LSP Multi Server Example', serverOptions, clientOptions ) - - client.onReady().then(() => { - registerConfigErrorHandler(client) - }) client.start() clients.set(folder.uri.toString(), client) diff --git a/packages/tailwindcss-vscode/src/lib/registerConfigErrorHandler.ts b/packages/tailwindcss-vscode/src/lib/registerConfigErrorHandler.ts deleted file mode 100644 index 819458efb3a9286fbf011b6f03c77558b6058428..0000000000000000000000000000000000000000 --- a/packages/tailwindcss-vscode/src/lib/registerConfigErrorHandler.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { LanguageClient } from 'vscode-languageclient' -import { window, Uri, Range, Position } from 'vscode' - -export function registerConfigErrorHandler(client: LanguageClient) { - client.onNotification( - 'tailwindcss/configError', - async ({ message, file, line }) => { - const actions: string[] = file ? ['View'] : [] - const action = await window.showErrorMessage( - `Tailwind CSS: ${message}`, - ...actions - ) - if (action === 'View') { - window.showTextDocument(Uri.file(file), { - selection: new Range( - new Position(line - 1, 0), - new Position(line - 1, 0) - ), - }) - } - } - ) -}