Merge from master

This commit is contained in:
Raj Musuku
2019-02-21 17:56:04 -08:00
parent 5a146e34fa
commit 666ae11639
11482 changed files with 119352 additions and 255574 deletions

View File

@@ -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 {