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

update all opened document diagnostics on save #237

Merged
merged 3 commits into from
Jun 29, 2020
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
27 changes: 27 additions & 0 deletions packages/language-server/src/lib/DiagnosticsManager.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { IConnection, TextDocumentIdentifier, Diagnostic } from 'vscode-languageserver';
import { DocumentManager, Document } from './documents';

export type SendDiagnostics = IConnection['sendDiagnostics'];
export type GetDiagnostics = (doc: TextDocumentIdentifier) => Thenable<Diagnostic[]>;

export class DiagnosticsManager {
constructor(
private sendDiagnostics: SendDiagnostics,
private docManager: DocumentManager,
private getDiagnostics: GetDiagnostics
) { }

updateAll() {
this.docManager.getAllOpenedByClient().forEach((doc) => {
this.update(doc[1]);
});
}

async update(document: Document) {
const diagnostics = await this.getDiagnostics({ uri: document.getURL() });
this.sendDiagnostics({
uri: document.getURL(),
diagnostics,
});
}
}
14 changes: 14 additions & 0 deletions packages/language-server/src/lib/documents/DocumentManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export type DocumentEvent = 'documentOpen' | 'documentChange' | 'documentClose';
*/
export class DocumentManager {
private emitter = new EventEmitter();
private openedInClient = new Set<string>();
public documents: Map<string, Document> = new Map();
public locked = new Set<string>();
public deleteCandidates = new Set<string>();
Expand All @@ -39,14 +40,25 @@ export class DocumentManager {
this.locked.add(uri);
}

markAsOpenedInClient(uri: string): void {
this.openedInClient.add(uri);
}

getAllOpenedByClient() {
return Array.from(this.documents.entries())
.filter((doc) => this.openedInClient.has(doc[0]));
}

releaseDocument(uri: string): void {
this.locked.delete(uri);
this.openedInClient.delete(uri);
if (this.deleteCandidates.has(uri)) {
this.deleteCandidates.delete(uri);
this.closeDocument(uri);
}
}


closeDocument(uri: string) {
const document = this.documents.get(uri);
if (!document) {
Expand All @@ -61,6 +73,8 @@ export class DocumentManager {
} else {
this.deleteCandidates.add(uri);
}

this.openedInClient.delete(uri);
}

updateDocument(
Expand Down
29 changes: 21 additions & 8 deletions packages/language-server/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import _ from 'lodash';
import { LSConfigManager } from './ls-config';
import { urlToPath } from './utils';
import { Logger } from './logger';
import { DiagnosticsManager } from './lib/DiagnosticsManager';

namespace TagCloseRequest {
export const type: RequestType<
Expand Down Expand Up @@ -99,6 +100,9 @@ export function startServer(options?: LSOptions) {
textDocumentSync: {
openClose: true,
change: TextDocumentSyncKind.Incremental,
save: {
includeText: false
},
},
hoverProvider: true,
completionProvider: {
Expand Down Expand Up @@ -162,6 +166,7 @@ export function startServer(options?: LSOptions) {
renameProvider: evt.capabilities.textDocument?.rename?.prepareSupport
? { prepareProvider: true }
: true,

},
};
});
Expand All @@ -175,7 +180,11 @@ export function startServer(options?: LSOptions) {
pluginHost.updateConfig(settings.svelte?.plugin);
});

connection.onDidOpenTextDocument((evt) => docManager.openDocument(evt.textDocument));
connection.onDidOpenTextDocument((evt) => {
docManager.openDocument(evt.textDocument);
docManager.markAsOpenedInClient(evt.textDocument.uri);
});

connection.onDidCloseTextDocument((evt) => docManager.closeDocument(evt.textDocument.uri));
connection.onDidChangeTextDocument((evt) =>
docManager.updateDocument(evt.textDocument, evt.contentChanges),
Expand Down Expand Up @@ -219,24 +228,28 @@ export function startServer(options?: LSOptions) {

return pluginHost.resolveCompletion(data, completionItem);
});

const diagnosticsManager = new DiagnosticsManager(
connection.sendDiagnostics,
docManager,
pluginHost.getDiagnostics.bind(pluginHost)
);

connection.onDidChangeWatchedFiles((para) => {
for (const change of para.changes) {
const filename = urlToPath(change.uri);
if (filename) {
pluginHost.onWatchFileChanges(filename, change.type);
}
}

diagnosticsManager.updateAll();
});
connection.onDidSaveTextDocument(() => diagnosticsManager.updateAll());

docManager.on(
'documentChange',
_.debounce(async (document: Document) => {
const diagnostics = await pluginHost.getDiagnostics({ uri: document.getURL() });
connection!.sendDiagnostics({
uri: document.getURL(),
diagnostics,
});
}, 500),
_.debounce(async (document: Document) => diagnosticsManager.update(document), 500),
);

// The language server protocol does not have a specific "did rename/move files" event,
Expand Down