mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-09 01:32:34 -05:00
Merge from vscode merge-base (#22780)
* Revert "Revert "Merge from vscode merge-base (#22769)" (#22779)"
This reverts commit 47a1745180.
* Fix notebook download task
* Remove done call from extensions-ci
This commit is contained in:
15
src/main.js
15
src/main.js
@@ -160,9 +160,6 @@ function configureCommandlineSwitchesSync(cliArgs) {
|
||||
// alias from us for --disable-gpu
|
||||
'disable-hardware-acceleration',
|
||||
|
||||
// provided by Electron
|
||||
'disable-color-correct-rendering',
|
||||
|
||||
// override for the color profile to use
|
||||
'force-color-profile'
|
||||
];
|
||||
@@ -254,9 +251,7 @@ function readArgvConfigSync() {
|
||||
|
||||
// Fallback to default
|
||||
if (!argvConfig) {
|
||||
argvConfig = {
|
||||
'disable-color-correct-rendering': true // Force pre-Chrome-60 color profile handling (for https://github.com/microsoft/vscode/issues/51791)
|
||||
};
|
||||
argvConfig = {};
|
||||
}
|
||||
|
||||
return argvConfig;
|
||||
@@ -286,11 +281,7 @@ function createDefaultArgvConfigSync(argvConfigPath) {
|
||||
'{',
|
||||
' // Use software rendering instead of hardware accelerated rendering.',
|
||||
' // This can help in cases where you see rendering issues in VS Code.',
|
||||
' // "disable-hardware-acceleration": true,',
|
||||
'',
|
||||
' // Enabled by default by VS Code to resolve color issues in the renderer',
|
||||
' // See https://github.com/microsoft/vscode/issues/51791 for details',
|
||||
' "disable-color-correct-rendering": true',
|
||||
' // "disable-hardware-acceleration": true',
|
||||
'}'
|
||||
];
|
||||
|
||||
@@ -329,7 +320,7 @@ function configureCrashReporter() {
|
||||
|
||||
if (!fs.existsSync(crashReporterDirectory)) {
|
||||
try {
|
||||
fs.mkdirSync(crashReporterDirectory);
|
||||
fs.mkdirSync(crashReporterDirectory, { recursive: true });
|
||||
} catch (error) {
|
||||
console.error(`The path '${crashReporterDirectory}' specified for --crash-reporter-directory does not seem to exist or cannot be created.`);
|
||||
app.exit(1);
|
||||
|
||||
Reference in New Issue
Block a user