mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Merge from master
This commit is contained in:
@@ -3,9 +3,7 @@
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
'use strict';
|
||||
|
||||
import { Event, Emitter } from 'vs/base/common/event';
|
||||
import { Emitter, Event } from 'vs/base/common/event';
|
||||
import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
|
||||
import { ITextModel } from 'vs/editor/common/model';
|
||||
import { LanguageSelector, score } from 'vs/editor/common/modes/languageSelector';
|
||||
@@ -24,11 +22,11 @@ function isExclusive(selector: LanguageSelector): boolean {
|
||||
} else if (Array.isArray(selector)) {
|
||||
return selector.every(isExclusive);
|
||||
} else {
|
||||
return selector.exclusive;
|
||||
return !!selector.exclusive;
|
||||
}
|
||||
}
|
||||
|
||||
export default class LanguageFeatureRegistry<T> {
|
||||
export class LanguageFeatureRegistry<T> {
|
||||
|
||||
private _clock: number = 0;
|
||||
private _entries: Entry<T>[] = [];
|
||||
@@ -43,7 +41,7 @@ export default class LanguageFeatureRegistry<T> {
|
||||
|
||||
register(selector: LanguageSelector, provider: T): IDisposable {
|
||||
|
||||
let entry: Entry<T> = {
|
||||
let entry: Entry<T> | undefined = {
|
||||
selector,
|
||||
provider,
|
||||
_score: -1,
|
||||
@@ -129,7 +127,7 @@ export default class LanguageFeatureRegistry<T> {
|
||||
}
|
||||
}
|
||||
|
||||
private _lastCandidate: { uri: string; language: string; };
|
||||
private _lastCandidate: { uri: string; language: string; } | undefined;
|
||||
|
||||
private _updateScores(model: ITextModel): void {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user