diff --git a/docs/src/language-server/configure-a-client.md b/docs/src/language-server/configure-a-client.md index 9e399e50..32e4aa8a 100644 --- a/docs/src/language-server/configure-a-client.md +++ b/docs/src/language-server/configure-a-client.md @@ -24,29 +24,6 @@ For example, while we may document `"somesass.loadPaths": []` (and write it this } ``` -### Server-only settings - -In addition to [the user settings](../user-guide/settings.md), language clients may want to configure these server-only settings to tweak how certain features interact with your specific editor. - -| Key | Description | -| ------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| `somesass.completion.afterModule` | Set this to the empty string if you end up with `module..$variable` after accepting a code suggestion item. If `module.` or `module` disappears, you can set it to `"{module}."` or `"{module}"` respectively. That is a "magic string" that will be replaced with the actual module name. | -| `somesass.completion.beforeVariable` | Set this to the empty string if you end up with `$$variable` after accepting a code suggestion item. | - -For example: - -```json -{ - "settings": { - "somesass": { - "completion": { - "afterModule": "{module}" - } - } - } -} -``` - ## Existing clients This list of [language client implementations][languageclients] may be a helpful starting point. You may also want to look at [existing clients](./existing-clients.md). diff --git a/docs/src/language-server/helix.md b/docs/src/language-server/helix.md index 2c498046..306218c3 100644 --- a/docs/src/language-server/helix.md +++ b/docs/src/language-server/helix.md @@ -8,7 +8,7 @@ You can configure new language servers in [`.config/helix/languages.toml`](https [language-server.some-sass-language-server] command = "some-sass-language-server" args = ["--stdio"] -config = { somesass = { completion = { afterModule = "", beforeVariable = "" } } } +config = { somesass = { loadPaths = [] } } [[language]] name = "scss" diff --git a/packages/language-server/README.md b/packages/language-server/README.md index 1c369d55..81ca4928 100644 --- a/packages/language-server/README.md +++ b/packages/language-server/README.md @@ -35,9 +35,7 @@ some-sass-language-server --stdio ### Workspace configuration -The language server requests [settings](../user-guide/settings.md) via the [`workspace/configuration` message](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#workspace_configuration), on the `somesass` key. All fields are optional. - -See the [documentation for the available settings](https://wkillerud.github.io/some-sass/user-guide/settings.html). +See [how to configure a client](https://wkillerud.github.io/some-sass/language-server/configure-a-client.html) and the [documentation for the available settings](https://wkillerud.github.io/some-sass/user-guide/settings.html). ## Capabilities diff --git a/packages/language-server/src/server.ts b/packages/language-server/src/server.ts index 34ea2d0a..79b755b9 100644 --- a/packages/language-server/src/server.ts +++ b/packages/language-server/src/server.ts @@ -146,8 +146,6 @@ export class SomeSassServer { suggestionStyle: settings.suggestionStyle, suggestFunctionsInStringContextAfterSymbols: settings.suggestFunctionsInStringContextAfterSymbols, - afterModule: settings.completion?.afterModule, - beforeVariable: settings.completion?.beforeVariable, }, }); } diff --git a/packages/language-server/src/settings.ts b/packages/language-server/src/settings.ts index f57fa3dc..acf0d3f3 100644 --- a/packages/language-server/src/settings.ts +++ b/packages/language-server/src/settings.ts @@ -8,10 +8,6 @@ export interface ISettings { readonly suggestFromUseOnly: boolean; readonly suggestFunctionsInStringContextAfterSymbols: " (+-*%"; readonly triggerPropertyValueCompletion: boolean; - readonly completion?: { - afterModule?: string; - beforeVariable?: string; - }; } export interface IEditorSettings { diff --git a/packages/language-services/src/language-feature.ts b/packages/language-services/src/language-feature.ts index 7234faa1..a9187e4e 100644 --- a/packages/language-services/src/language-feature.ts +++ b/packages/language-services/src/language-feature.ts @@ -46,8 +46,6 @@ const defaultConfiguration: LanguageServiceConfiguration = { suggestFunctionsInStringContextAfterSymbols: " (+-*%", suggestionStyle: "all", triggerPropertyValueCompletion: true, - afterModule: ".", - beforeVariable: "$", }, }; diff --git a/packages/language-services/src/language-services-types.ts b/packages/language-services/src/language-services-types.ts index 85da7f85..c1cc3a2b 100644 --- a/packages/language-services/src/language-services-types.ts +++ b/packages/language-services/src/language-services-types.ts @@ -225,33 +225,6 @@ export interface LanguageServiceConfiguration { */ triggerPropertyValueCompletion?: boolean; includePrefixDot?: boolean; - /** - * If you end up with an extra `.` after accepting a suggestion, set this to the empty string. - * If your module disappears, set it to "{module}" or "{module}." depending on your situation. - * - * @example - * ```scss - * .foo { - * // set this setting to the empty string "" to fix this bug, - * // which varies depending on your editor's grammar for Sass. - * color: module..$variable; - * } - * ``` - */ - afterModule?: string; - /** - * If you end up with an extra `&` after accepting a suggestion, set this to the empty string. - * - * @example - * ```scss - * .foo { - * // set this setting to the empty string "" to fix this bug, - * // which varies depending on your editor's grammar for Sass. - * color: $$variable; - * } - * ``` - */ - beforeVariable?: string; }; editorSettings?: EditorSettings; workspaceRoot?: URI;