ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 966b87dd4013be1a9c06e2b8334522ec61905cc2 (#4696)

Browse Source
This commit is contained in:
Anthony Dresser
2019-03-26 11:43:38 -07:00
committed by GitHub
parent b1393ae615
commit 0d8ef9583b
268 changed files with 5947 additions and 3422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vs/editor/common/modes/languageConfigurationRegistry.ts
View File

@@ -57,7 +57,7 @@ export class RichEditSupport {
public readonly indentationRules: IndentationRule | undefined;
public readonly foldingRules: FoldingRules;
constructor(languageIdentifier: LanguageIdentifier, previous: RichEditSupport, rawConf: LanguageConfiguration) {
constructor(languageIdentifier: LanguageIdentifier, previous: RichEditSupport | undefined, rawConf: LanguageConfiguration) {
this._languageIdentifier = languageIdentifier;
this._brackets = null;
@@ -175,34 +175,30 @@ export class LanguageConfigurationChangeEvent {
export class LanguageConfigurationRegistryImpl {
private readonly _entries: RichEditSupport[];
private readonly _entries = new Map<LanguageId, RichEditSupport>();
private readonly _onDidChange = new Emitter<LanguageConfigurationChangeEvent>();
public readonly onDidChange: Event<LanguageConfigurationChangeEvent> = this._onDidChange.event;
constructor() {
this._entries = [];
}
public register(languageIdentifier: LanguageIdentifier, configuration: LanguageConfiguration): IDisposable {
let previous = this._getRichEditSupport(languageIdentifier.id);
let current = new RichEditSupport(languageIdentifier, previous, configuration);
this._entries[languageIdentifier.id] = current;
this._entries.set(languageIdentifier.id, current);
this._onDidChange.fire({ languageIdentifier });
return toDisposable(() => {
if (this._entries[languageIdentifier.id] === current) {
this._entries[languageIdentifier.id] = previous;
if (this._entries.get(languageIdentifier.id) === current) {
this._entries.set(languageIdentifier.id, previous);
this._onDidChange.fire({ languageIdentifier });
}
});
}
private _getRichEditSupport(languageId: LanguageId): RichEditSupport {
return this._entries[languageId] || null;
private _getRichEditSupport(languageId: LanguageId): RichEditSupport | undefined {
return this._entries.get(languageId);
}
public getIndentationRules(languageId: LanguageId) {
let value = this._entries[languageId];
const value = this._entries.get(languageId);
if (!value) {
return null;

30
src/vs/editor/common/modes/tokenizationRegistry.ts
View File

@@ -7,11 +7,13 @@ import { Color } from 'vs/base/common/color';
import { Emitter, Event } from 'vs/base/common/event';
import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
import { ColorId, ITokenizationRegistry, ITokenizationSupport, ITokenizationSupportChangedEvent } from 'vs/editor/common/modes';
import { withUndefinedAsNull } from 'vs/base/common/types';
import { keys } from 'vs/base/common/map';
export class TokenizationRegistryImpl implements ITokenizationRegistry {
private readonly _map: { [language: string]: ITokenizationSupport };
private readonly _promises: { [language: string]: Thenable<void> };
private readonly _map = new Map<string, ITokenizationSupport>();
private readonly _promises = new Map<string, Thenable<void>>();
private readonly _onDidChange = new Emitter<ITokenizationSupportChangedEvent>();
public readonly onDidChange: Event<ITokenizationSupportChangedEvent> = this._onDidChange.event;
@@ -19,8 +21,6 @@ export class TokenizationRegistryImpl implements ITokenizationRegistry {
private _colorMap: Color[] | null;
constructor() {
this._map = Object.create(null);
this._promises = Object.create(null);
this._colorMap = null;
}
@@ -32,13 +32,13 @@ export class TokenizationRegistryImpl implements ITokenizationRegistry {
}
public register(language: string, support: ITokenizationSupport) {
this._map[language] = support;
this._map.set(language, support);
this.fire([language]);
return toDisposable(() => {
if (this._map[language] !== support) {
if (this._map.get(language) !== support) {
return;
}
delete this._map[language];
this._map.delete(language);
this.fire([language]);
});
}
@@ -48,13 +48,13 @@ export class TokenizationRegistryImpl implements ITokenizationRegistry {
let registration: IDisposable | null = null;
let isDisposed: boolean = false;
this._promises[language] = supportPromise.then(support => {
delete this._promises[language];
this._promises.set(language, supportPromise.then(support => {
this._promises.delete(language);
if (isDisposed || !support) {
return;
}
registration = this.register(language, support);
});
}));
return toDisposable(() => {
isDisposed = true;
@@ -69,21 +69,21 @@ export class TokenizationRegistryImpl implements ITokenizationRegistry {
if (support) {
return Promise.resolve(support);
}
const promise = this._promises[language];
const promise = this._promises.get(language);
if (promise) {
return promise.then(_ => this.get(language));
return promise.then(_ => this.get(language)!);
}
return null;
}
public get(language: string): ITokenizationSupport {
return (this._map[language] || null);
public get(language: string): ITokenizationSupport | null {
return withUndefinedAsNull(this._map.get(language));
}
public setColorMap(colorMap: Color[]): void {
this._colorMap = colorMap;
this._onDidChange.fire({
changedLanguages: Object.keys(this._map),
changedLanguages: keys(this._map),
changedColorMap: true
});
}