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

Merge from vscode 52dcb723a39ae75bee1bd56b3312d7fcdc87aeed (#6719)

Browse Source
This commit is contained in:
Anthony Dresser
2019-08-12 21:31:51 -07:00
committed by GitHub
parent 00250839fc
commit 7eba8c4c03
616 changed files with 9472 additions and 7087 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,7 @@ export class RichEditSupport {
public readonly characterPair: CharacterPairSupport;
public readonly wordDefinition: RegExp;
public readonly onEnter: OnEnterSupport | null;
public readonly indentRulesSupport: IndentRulesSupport;
public readonly indentRulesSupport: IndentRulesSupport | null;
public readonly indentationRules: IndentationRule | undefined;
public readonly foldingRules: FoldingRules;
@@ -81,6 +81,8 @@ export class RichEditSupport {
this.indentationRules = this._conf.indentationRules;
if (this._conf.indentationRules) {
this.indentRulesSupport = new IndentRulesSupport(this._conf.indentationRules);
} else {
this.indentRulesSupport = null;
}
this.foldingRules = this._conf.folding || {};
@@ -170,7 +172,9 @@ export class RichEditSupport {
}
export class LanguageConfigurationChangeEvent {
languageIdentifier: LanguageIdentifier;
constructor(
public readonly languageIdentifier: LanguageIdentifier
) { }
}
export class LanguageConfigurationRegistryImpl {
@@ -184,11 +188,11 @@ export class LanguageConfigurationRegistryImpl {
let previous = this._getRichEditSupport(languageIdentifier.id);
let current = new RichEditSupport(languageIdentifier, previous, configuration);
this._entries.set(languageIdentifier.id, current);
this._onDidChange.fire({ languageIdentifier });
this._onDidChange.fire(new LanguageConfigurationChangeEvent(languageIdentifier));
return toDisposable(() => {
if (this._entries.get(languageIdentifier.id) === current) {
this._entries.set(languageIdentifier.id, previous);
this._onDidChange.fire({ languageIdentifier });
this._onDidChange.fire(new LanguageConfigurationChangeEvent(languageIdentifier));
}
});
}

4
src/vs/editor/common/modes/textToHtmlTokenizer.ts
View File

@@ -77,6 +77,10 @@ export function tokenizeLineToHTML(text: string, viewLineTokens: IViewLineTokens
partContent += '&#8203';
break;
case CharCode.Space:
partContent += '&nbsp';
break;
default:
partContent += String.fromCharCode(charCode);
}