Skip to content

State that the WorkspaceClientCapabilites's applyEdit capability is enabled #55

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.

Sign up for GitHub

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

Merged
rcjsuen merged 1 commit into from
Feb 12, 2018
Merged

State that the WorkspaceClientCapabilites's applyEdit capability is enabled #55

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/workspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
* ------------------------------------------------------------------------------------------ */
import { MonacoToProtocolConverter, ProtocolToMonacoConverter } from './converter';
import { Workspace, TextDocumentDidChangeEvent, TextDocument, Event, Emitter } from 'vscode-base-languageclient/lib/services';
import { Workspace, TextDocumentDidChangeEvent, TextDocument, Event, Emitter, WorkspaceClientCapabilites } from 'vscode-base-languageclient/lib/services';
import { WorkspaceEdit } from 'vscode-base-languageclient/lib/base';
import IModel = monaco.editor.IModel;
import IResourceEdit = monaco.languages.IResourceEdit;

export class MonacoWorkspace implements Workspace {

public readonly capabilities: WorkspaceClientCapabilites = {
applyEdit: true

@akosyakov akosyakov Feb 12, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch! I think documentChanges are covered by applyEdit as well. Could you add them to capabilities please:

    applyEdit: true,
    workspaceEdit: {
        documentChanges: true
    }

@rcjsuen rcjsuen Feb 12, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@akosyakov Actually, the documentChanges support isn't perfect right now.

monaco-languageclient/src/converter.ts

Lines 293 to 298 in aa74043

if (item.documentChanges) {
for (const change of item.documentChanges) {
const resource = monaco.Uri.parse(change.textDocument.uri);
edits.push(...this.asResourceEdits(resource, change.edits));
}
} else if (item.changes) {

We just convert them into IResourceEdits without checking if the version from the language server matches what's in the Monaco Editor. I am planning to address this (as well as updating the capabilities) in a separate pull request.

};
protected readonly documents = new Map<string, TextDocument>();
protected readonly onDidOpenTextDocumentEmitter = new Emitter<TextDocument>();
protected readonly onDidCloseTextDocumentEmitter = new Emitter<TextDocument>();
Expand Down