ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-27 07:10:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode merge-base (#22780)

Browse Source 
* 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:
Karl Burtram
2023-04-19 21:48:46 -07:00
committed by GitHub
parent decbe8dded
commit e7d3d047ec
2389 changed files with 92155 additions and 42602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
extensions/merge-conflict/src/services.ts
View File

@@ -21,7 +21,7 @@ export default class ServiceWrapper implements vscode.Disposable {
begin() {
let configuration = this.createExtensionConfiguration();
const configuration = this.createExtensionConfiguration();
const documentTracker = new DocumentTracker();
this.services.push(
@@ -48,6 +48,19 @@ export default class ServiceWrapper implements vscode.Disposable {
}
createExtensionConfiguration(): interfaces.IExtensionConfiguration {
// PRAGMATIC way to avoid conflicting with the new merge editor: when git opts into
// using the merge editor we disable this extension - for the merge editor but also
// for "other" editors
const gitConfig = vscode.workspace.getConfiguration('git');
if (gitConfig.get<boolean>('mergeEditor')) {
return {
enableCodeLens: false,
enableDecorations: false,
enableEditorOverview: false
};
}
const workspaceConfiguration = vscode.workspace.getConfiguration(ConfigurationSectionName);
const codeLensEnabled: boolean = workspaceConfiguration.get('codeLens.enabled', true);
const decoratorsEnabled: boolean = workspaceConfiguration.get('decorators.enabled', true);
@@ -64,4 +77,3 @@ export default class ServiceWrapper implements vscode.Disposable {
this.services = [];
}
}