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

Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

Browse Source 
* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks
This commit is contained in:
Anthony Dresser
2019-09-15 22:38:26 -07:00
committed by GitHub
parent fa6c52699e
commit ea0f9e6ce9
1226 changed files with 21541 additions and 17633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/editor/common/model/textModel.ts
View File

@@ -2621,8 +2621,8 @@ class DecorationOptions implements model.IDecorationOptions {
readonly darkColor: string | ThemeColor;
constructor(options: model.IDecorationOptions) {
this.color = options.color || strings.empty;
this.darkColor = options.darkColor || strings.empty;
this.color = options.color || '';
this.darkColor = options.darkColor || '';
}
}
@@ -2658,7 +2658,7 @@ export class ModelDecorationOverviewRulerOptions extends DecorationOptions {
}
let c = color ? theme.getColor(color.id) : null;
if (!c) {
return strings.empty;
return '';
}
return c.toString();
}

3
src/vs/editor/common/model/textModelSearch.ts
View File

@@ -45,7 +45,8 @@ export class SearchParams {
matchCase: this.matchCase,
wholeWord: false,
multiline: multiline,
global: true
global: true,
unicode: true
});
} catch (err) {
return null;