Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: handle per resource configuration #411

Merged
merged 2 commits into from
May 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Studio Code, powered by the Deno language server.
- Allow specifying of import maps and TypeScript configuration files that are
used with the Deno CLI.
- [Auto completion for imports](./docs/ImportCompletions.md).
- [Workspace folder configuration](./docs/workspaceFolders.md).

## Usage

Expand Down
176 changes: 142 additions & 34 deletions client/src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,17 @@ import * as semver from "semver";
import * as vscode from "vscode";
import type { Executable } from "vscode-languageclient/node";

/** The minimum version of Deno that this extension is designed to support. */
const SERVER_SEMVER = ">=1.9.0";

/** The language IDs we care about. */
const LANGUAGES = [
"typescript",
"javascript",
"typescriptreact",
"javascriptreact",
];

interface TsLanguageFeatures {
getAPI(version: 0): TsLanguageFeaturesApiV0 | undefined;
}
Expand All @@ -46,26 +55,119 @@ async function getTsApi(): Promise<TsLanguageFeaturesApiV0> {
return api;
}

const settingsKeys: Array<keyof Settings> = [
/** These are keys of settings that have a scope of window or machine. */
const workspaceSettingsKeys: Array<keyof Settings> = [
"codeLens",
"config",
"enable",
"importMap",
"lint",
"suggest",
"unstable",
];

function getSettings(): Settings {
const settings = vscode.workspace.getConfiguration(EXTENSION_NS);
const result = Object.create(null);
for (const key of settingsKeys) {
const value = settings.inspect(key);
/** These are keys of settings that can apply to an individual resource, like
* a file or folder. */
const resourceSettingsKeys: Array<keyof Settings> = [
"enable",
];

/** Convert a workspace configuration to `Settings` for a workspace. */
function configToWorkspaceSettings(
config: vscode.WorkspaceConfiguration,
): Settings {
const workspaceSettings = Object.create(null);
for (const key of workspaceSettingsKeys) {
const value = config.inspect(key);
assert(value);
workspaceSettings[key] = value.workspaceLanguageValue ??
value.workspaceValue ??
value.globalValue ??
value.defaultValue;
}
for (const key of resourceSettingsKeys) {
const value = config.inspect(key);
assert(value);
result[key] = value.workspaceValue ?? value.globalValue ??
workspaceSettings[key] = value.workspaceLanguageValue ??
value.workspaceValue ??
value.globalValue ??
value.defaultValue;
}
return result;
return workspaceSettings;
}

/** Convert a workspace configuration to settings that apply to a resource. */
function configToResourceSettings(
config: vscode.WorkspaceConfiguration,
): Partial<Settings> {
const resourceSettings = Object.create(null);
for (const key of resourceSettingsKeys) {
const value = config.inspect(key);
assert(value);
resourceSettings[key] = value.workspaceFolderLanguageValue ??
value.workspaceFolderValue ?? value.workspaceLanguageValue ??
value.workspaceValue ??
value.globalValue ??
value.defaultValue;
}
return resourceSettings;
}

function getWorkspaceSettings(): Settings {
const config = vscode.workspace.getConfiguration(EXTENSION_NS);
return configToWorkspaceSettings(config);
}

/** Update the typescript-deno-plugin with settings. */
function configurePlugin() {
const { documentSettings: documents, tsApi, workspaceSettings: workspace } =
extensionContext;
tsApi.configurePlugin(EXTENSION_TS_PLUGIN, { workspace, documents });
}

function handleConfigurationChange(event: vscode.ConfigurationChangeEvent) {
if (event.affectsConfiguration(EXTENSION_NS)) {
extensionContext.client.sendNotification(
"workspace/didChangeConfiguration",
// We actually set this to empty because the language server will
// call back and get the configuration. There can be issues with the
// information on the event not being reliable.
{ settings: null },
);
extensionContext.workspaceSettings = getWorkspaceSettings();
for (
const [key, { scope }] of Object.entries(
extensionContext.documentSettings,
)
) {
extensionContext.documentSettings[key] = {
scope,
settings: configToResourceSettings(
vscode.workspace.getConfiguration(EXTENSION_NS, scope),
),
};
}
configurePlugin();
}
}

function handleDocumentOpen(...documents: vscode.TextDocument[]) {
let didChange = false;
for (const doc of documents) {
if (!LANGUAGES.includes(doc.languageId)) {
continue;
}
const { languageId, uri } = doc;
extensionContext.documentSettings[path.normalize(doc.uri.fsPath)] = {
scope: { languageId, uri },
settings: configToResourceSettings(
vscode.workspace.getConfiguration(EXTENSION_NS, { languageId, uri }),
),
};
didChange = true;
}
if (didChange) {
configurePlugin();
}
}

const extensionContext = {} as DenoExtensionContext;
Expand Down Expand Up @@ -105,33 +207,36 @@ export async function activate(
{ scheme: "deno", language: "typescriptreact" },
],
diagnosticCollectionName: "deno",
initializationOptions: getSettings(),
initializationOptions: getWorkspaceSettings(),
};

// When a document opens, the language server will query the client to
// determine the specific configuration of a resource, we need to ensure the
// the builtin TypeScript language service has the same "view" of the world,
// so when Deno is enabled, we need to disable the built in language service,
// but this is determined on a file by file basis.
vscode.workspace.onDidOpenTextDocument(
handleDocumentOpen,
extensionContext,
context.subscriptions,
);

// Send a notification to the language server when the configuration changes
// as well as update the TypeScript language service plugin
vscode.workspace.onDidChangeConfiguration(
handleConfigurationChange,
extensionContext,
context.subscriptions,
);

extensionContext.statusBarItem = vscode.window.createStatusBarItem(
vscode.StatusBarAlignment.Right,
0,
);
context.subscriptions.push(extensionContext.statusBarItem);

// Register a content provider for Deno resolved read-only files.
context.subscriptions.push(
// Send a notification to the language server when the configuration changes
vscode.workspace.onDidChangeConfiguration((evt) => {
if (evt.affectsConfiguration(EXTENSION_NS)) {
extensionContext.client.sendNotification(
"workspace/didChangeConfiguration",
// We actually set this to empty because the language server will
// call back and get the configuration. There can be issues with the
// information on the event not being reliable.
{ settings: null },
);
extensionContext.tsApi.configurePlugin(
EXTENSION_TS_PLUGIN,
getSettings(),
);
}
}),
// Register a content provider for Deno resolved read-only files.
vscode.workspace.registerTextDocumentContentProvider(
SCHEME,
new DenoTextDocumentContentProvider(extensionContext),
Expand All @@ -141,7 +246,7 @@ export async function activate(
context.subscriptions.push(
vscode.debug.registerDebugConfigurationProvider(
"deno",
new DenoDebugConfigurationProvider(getSettings),
new DenoDebugConfigurationProvider(getWorkspaceSettings),
),
);

Expand All @@ -159,10 +264,13 @@ export async function activate(

await commands.startLanguageServer(context, extensionContext)();

extensionContext.tsApi.configurePlugin(
EXTENSION_TS_PLUGIN,
getSettings(),
);
extensionContext.documentSettings = {};
extensionContext.workspaceSettings = getWorkspaceSettings();
configurePlugin();
// when we activate, it might have been because a document was opened that
// activated us, which we need to grab the config for and send it over to the
// plugin
handleDocumentOpen(...vscode.workspace.textDocuments);

if (
semver.valid(extensionContext.serverVersion) &&
Expand Down Expand Up @@ -290,8 +398,8 @@ function getDefaultDenoCommand() {
}
}

function fileExists(executableFilePath: string) {
return new Promise((resolve) => {
function fileExists(executableFilePath: string): Promise<boolean> {
return new Promise<boolean>((resolve) => {
fs.stat(executableFilePath, (err, stat) => {
resolve(err == null && stat.isFile());
});
Expand Down
18 changes: 16 additions & 2 deletions client/src/interfaces.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright 2018-2021 the Deno authors. All rights reserved. MIT license.

import type { StatusBarItem } from "vscode";
import type { ConfigurationScope, StatusBarItem } from "vscode";
import type {
LanguageClient,
LanguageClientOptions,
Expand Down Expand Up @@ -40,18 +40,32 @@ export interface Settings {
unstable: boolean;
}

export interface PluginSettings {
workspace: Settings;
documents: Record<string, DocumentSettings>;
}

export interface DocumentSettings {
scope: ConfigurationScope;
settings: Partial<Settings>;
}

export interface DenoExtensionContext {
client: LanguageClient;
clientOptions: LanguageClientOptions;
/** A record of filepaths and their document settings. */
documentSettings: Record<string, DocumentSettings>;
serverOptions: ServerOptions;
serverVersion: string;
statusBarItem: StatusBarItem;
tsApi: TsLanguageFeaturesApiV0;
/** The current workspace settings. */
workspaceSettings: Settings;
}

export interface TsLanguageFeaturesApiV0 {
configurePlugin(
pluginId: string,
configuration: Settings,
configuration: PluginSettings,
): void;
}
2 changes: 1 addition & 1 deletion client/src/lsp_extensions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/** Contains extensions to the Language Server Protocol that are supported by
* the Deno Language Server.
*
*
* The requests and notifications types should mirror the Deno's CLI
* `cli/lsp/language_server.rs` under the method `request_else`.
*/
Expand Down
37 changes: 37 additions & 0 deletions docs/workspaceFolders.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Workspace Folders

The Deno language server and this extension supports
[multi-root workspaces](https://code.visualstudio.com/docs/editor/multi-root-workspaces)
configuration, where certain settings can be applied to workspace folders within
a workspace.

When you add folders to your workspace and open the settings, you will have
access to the per folder settings. If you look at the `.vscode/settings.json` in
a folder, you will see a visual indication of what settings apply to folder,
versus those that come from the workspace configuration:

![alt text](../screenshots/workspace_folder_config.png ".vscode/settings.json example")

## Workspace Folder Settings

These are the settings that can be set on a workspace folder. The rest of the
settings currently only apply to the workspace:

- `deno.enable` - Controls if the Deno Language Server is enabled. When enabled,
the extension will disable the built-in VSCode JavaScript and TypeScript
language services, and will use the Deno Language Server (`deno lsp`) instead.
_boolean, default `false`_

## Mixed-Deno projects

With this feature, you can have a mixed Deno project, where some of the
workspace folders are Deno enabled and some are not. This is useful when
creating a project that might have a front-end component, where you want a
different configuration for that front end code.

In order to support this, you would create a new workspace (or add a folder to
an existing workspace) and in the settings configure one of the folders to have
`deno.enable` set to `true` and one set to `false`. Once you save the workspace
configuration, you notice that the Deno language server only applies diagnostics
to the enabled folders, while the other folder will use the built in TypeScript
compiler of vscode to supply diagnostics for TypeScript and JavaScript files.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
"type": "boolean",
"default": false,
"markdownDescription": "Controls if the Deno Language Server is enabled. When enabled, the extension will disable the built-in VSCode JavaScript and TypeScript language services, and will use the Deno Language Server (`deno lsp`) instead.\n\n**Not recommended to be enabled globally.**",
"scope": "window",
"scope": "resource",
"examples": [
true,
false
Expand Down
Binary file added screenshots/workspace_folder_config.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading