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.

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

Jump to bottom

fix: register providers only for languages matching the documentSelector #101

Merged
merged 1 commit into from
Aug 1, 2018
Merged

fix: register providers only for languages matching the documentSelector #101

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
80 changes: 63 additions & 17 deletions src/monaco-languages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ export class MonacoLanguages implements Languages {
const completionProvider = this.createCompletionProvider(selector, provider, ...triggerCharacters);
const providers = new DisposableCollection();
for (const language of getLanguages()) {
providers.push(monaco.languages.registerCompletionItemProvider(language, completionProvider))
if (this.matchLanguage(selector, language)) {
providers.push(monaco.languages.registerCompletionItemProvider(language, completionProvider))
}
};
return providers;
}
Expand Down Expand Up @@ -100,7 +102,9 @@ export class MonacoLanguages implements Languages {
const hoverProvider = this.createHoverProvider(selector, provider);
const providers = new DisposableCollection();
for (const language of getLanguages()) {
providers.push(monaco.languages.registerHoverProvider(language, hoverProvider));
if (this.matchLanguage(selector, language)) {
providers.push(monaco.languages.registerHoverProvider(language, hoverProvider));
}
}
return providers;
}
Expand All @@ -121,7 +125,9 @@ export class MonacoLanguages implements Languages {
const signatureHelpProvider = this.createSignatureHelpProvider(selector, provider, ...triggerCharacters);
const providers = new DisposableCollection();
for (const language of getLanguages()) {
providers.push(monaco.languages.registerSignatureHelpProvider(language, signatureHelpProvider));
if (this.matchLanguage(selector, language)) {
providers.push(monaco.languages.registerSignatureHelpProvider(language, signatureHelpProvider));
}
}
return providers;
}
Expand All @@ -144,7 +150,9 @@ export class MonacoLanguages implements Languages {
const definitionProvider = this.createDefinitionProvider(selector, provider);
const providers = new DisposableCollection();
for (const language of getLanguages()) {
providers.push(monaco.languages.registerDefinitionProvider(language, definitionProvider));
if (this.matchLanguage(selector, language)) {
providers.push(monaco.languages.registerDefinitionProvider(language, definitionProvider));
}
}
return providers;
}
Expand All @@ -165,7 +173,9 @@ export class MonacoLanguages implements Languages {
const referenceProvider = this.createReferenceProvider(selector, provider);
const providers = new DisposableCollection();
for (const language of getLanguages()) {
providers.push(monaco.languages.registerReferenceProvider(language, referenceProvider));
if (this.matchLanguage(selector, language)) {
providers.push(monaco.languages.registerReferenceProvider(language, referenceProvider));
}
}
return providers;
}
Expand All @@ -186,7 +196,9 @@ export class MonacoLanguages implements Languages {
const documentHighlightProvider = this.createDocumentHighlightProvider(selector, provider);
const providers = new DisposableCollection();
for (const language of getLanguages()) {
providers.push(monaco.languages.registerDocumentHighlightProvider(language, documentHighlightProvider));
if (this.matchLanguage(selector, language)) {
providers.push(monaco.languages.registerDocumentHighlightProvider(language, documentHighlightProvider));
}
}
return providers;
}
Expand All @@ -207,7 +219,9 @@ export class MonacoLanguages implements Languages {
const documentSymbolProvider = this.createDocumentSymbolProvider(selector, provider);
const providers = new DisposableCollection();
for (const language of getLanguages()) {
providers.push(monaco.languages.registerDocumentSymbolProvider(language, documentSymbolProvider));
if (this.matchLanguage(selector, language)) {
providers.push(monaco.languages.registerDocumentSymbolProvider(language, documentSymbolProvider));
}
}
return providers;
}
Expand All @@ -228,7 +242,9 @@ export class MonacoLanguages implements Languages {
const codeActionProvider = this.createCodeActionProvider(selector, provider);
const providers = new DisposableCollection();
for (const language of getLanguages()) {
providers.push(monaco.languages.registerCodeActionProvider(language, codeActionProvider));
if (this.matchLanguage(selector, language)) {
providers.push(monaco.languages.registerCodeActionProvider(language, codeActionProvider));
}
}
return providers;
}
Expand All @@ -249,7 +265,9 @@ export class MonacoLanguages implements Languages {
const codeLensProvider = this.createCodeLensProvider(selector, provider);
const providers = new DisposableCollection();
for (const language of getLanguages()) {
providers.push(monaco.languages.registerCodeLensProvider(language, codeLensProvider));
if (this.matchLanguage(selector, language)) {
providers.push(monaco.languages.registerCodeLensProvider(language, codeLensProvider));
}
}
return providers;
}
Expand Down Expand Up @@ -281,7 +299,9 @@ export class MonacoLanguages implements Languages {
const documentFormattingEditProvider = this.createDocumentFormattingEditProvider(selector, provider);
const providers = new DisposableCollection();
for (const language of getLanguages()) {
providers.push(monaco.languages.registerDocumentFormattingEditProvider(language, documentFormattingEditProvider));
if (this.matchLanguage(selector, language)) {
providers.push(monaco.languages.registerDocumentFormattingEditProvider(language, documentFormattingEditProvider));
}
}
return providers;
}
Expand All @@ -302,7 +322,9 @@ export class MonacoLanguages implements Languages {
const documentRangeFormattingEditProvider = this.createDocumentRangeFormattingEditProvider(selector, provider);
const providers = new DisposableCollection();
for (const language of getLanguages()) {
providers.push(monaco.languages.registerDocumentRangeFormattingEditProvider(language, documentRangeFormattingEditProvider));
if (this.matchLanguage(selector, language)) {
providers.push(monaco.languages.registerDocumentRangeFormattingEditProvider(language, documentRangeFormattingEditProvider));
}
}
return providers;
}
Expand All @@ -323,7 +345,9 @@ export class MonacoLanguages implements Languages {
const onTypeFormattingEditProvider = this.createOnTypeFormattingEditProvider(selector, provider, firstTriggerCharacter, ...moreTriggerCharacter);
const providers = new DisposableCollection();
for (const language of getLanguages()) {
providers.push(monaco.languages.registerOnTypeFormattingEditProvider(language, onTypeFormattingEditProvider));
if (this.matchLanguage(selector, language)) {
providers.push(monaco.languages.registerOnTypeFormattingEditProvider(language, onTypeFormattingEditProvider));
}
}
return providers;
}
Expand All @@ -346,7 +370,9 @@ export class MonacoLanguages implements Languages {
const renameProvider = this.createRenameProvider(selector, provider);
const providers = new DisposableCollection();
for (const language of getLanguages()) {
providers.push(monaco.languages.registerRenameProvider(language, renameProvider));
if (this.matchLanguage(selector, language)) {
providers.push(monaco.languages.registerRenameProvider(language, renameProvider));
}
}
return providers;
}
Expand All @@ -367,7 +393,9 @@ export class MonacoLanguages implements Languages {
const linkProvider = this.createDocumentLinkProvider(selector, provider);
const providers = new DisposableCollection();
for (const language of getLanguages()) {
providers.push(monaco.languages.registerLinkProvider(language, linkProvider));
if (this.matchLanguage(selector, language)) {
providers.push(monaco.languages.registerLinkProvider(language, linkProvider));
}
}
return providers;
}
Expand Down Expand Up @@ -402,7 +430,9 @@ export class MonacoLanguages implements Languages {
const implementationProvider = this.createImplementationProvider(selector, provider);
const providers = new DisposableCollection();
for (const language of getLanguages()) {
providers.push(monaco.languages.registerImplementationProvider(language, implementationProvider));
if (this.matchLanguage(selector, language)) {
providers.push(monaco.languages.registerImplementationProvider(language, implementationProvider));
}
}
return providers;
}
Expand All @@ -423,7 +453,9 @@ export class MonacoLanguages implements Languages {
const typeDefinitionProvider = this.createTypeDefinitionProvider(selector, provider);
const providers = new DisposableCollection();
for (const language of getLanguages()) {
providers.push(monaco.languages.registerTypeDefinitionProvider(language, typeDefinitionProvider));
if (this.matchLanguage(selector, language)) {
providers.push(monaco.languages.registerTypeDefinitionProvider(language, typeDefinitionProvider));
}
}
return providers;
}
Expand All @@ -444,7 +476,9 @@ export class MonacoLanguages implements Languages {
const documentColorProvider = this.createDocumentColorProvider(selector, provider);
const providers = new DisposableCollection();
for (const language of getLanguages()) {
providers.push(monaco.languages.registerColorProvider(language, documentColorProvider));
if (this.matchLanguage(selector, language)) {
providers.push(monaco.languages.registerColorProvider(language, documentColorProvider));
}
}
return providers;
}
Expand Down Expand Up @@ -492,4 +526,16 @@ export class MonacoLanguages implements Languages {
return selector === model.languageId;
}

protected matchLanguage(selector: string | DocumentFilter | DocumentSelector, languageId: string): boolean {
if (Array.isArray(selector)) {
return selector.findIndex(filter => this.matchLanguage(filter, languageId)) !== -1;
Copy link
Contributor

Choose a reason for hiding this comment

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

fyi: selector.some(...) === selector.findIndex(...) !== -1

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh I would have used "some", but I saw findIndex used in matchModel and thought it's a coding standard you want to stick to. Will keep in mind for future PRs

Copy link
Contributor

Choose a reason for hiding this comment

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

true, I will change it in: #100

}

if (DocumentFilter.is(selector)) {
return !selector.language || selector.language === languageId;
}

return selector === languageId;
}

}