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

Fixed UI regression (#16526)

Browse Source 
* Add CodeQL Analysis workflow (#10195)

* Add CodeQL Analysis workflow

* Fix path

* Fixed UI regression in main

* removed the file which should not been included

* Addressed PR comments

* Addressed PR

Co-authored-by: Justin Hutchings <jhutchings1@users.noreply.github.com>
This commit is contained in:
rajeshka
2021-08-02 15:21:05 -07:00
committed by GitHub
parent 919cc732b7
commit 56ad631478
2 changed files with 150 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
View File

@@ -74,6 +74,7 @@ import { EditorExtensions } from 'vs/workbench/common/editor';
import { WORKSPACE_TRUST_EXTENSION_SUPPORT } from 'vs/workbench/services/workspaces/common/workspaceTrust'; import { WORKSPACE_TRUST_EXTENSION_SUPPORT } from 'vs/workbench/services/workspaces/common/workspaceTrust';
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage'; // {{SQL CARBON EDIT}} import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage'; // {{SQL CARBON EDIT}}
import * as locConstants from 'sql/base/common/locConstants'; // {{SQL CARBON EDIT}} import * as locConstants from 'sql/base/common/locConstants'; // {{SQL CARBON EDIT}}
import product from 'vs/platform/product/common/product'; // {{SQL CARBON EDIT}}
// Singletons // Singletons
registerSingleton(IExtensionsWorkbenchService, ExtensionsWorkbenchService); registerSingleton(IExtensionsWorkbenchService, ExtensionsWorkbenchService);
@@ -676,6 +677,8 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
} }
}); });
if (product.quality !== 'saw') { // {{SQL CARBON EDIT}} - Remove items that are not required
this.registerExtensionAction({ this.registerExtensionAction({
id: 'workbench.extensions.action.disableAllWorkspace', id: 'workbench.extensions.action.disableAllWorkspace',
title: { value: localize('disableAllWorkspace', "Disable All Installed Extensions for this Workspace"), original: 'Disable All Installed Extensions for this Workspace' }, title: { value: localize('disableAllWorkspace', "Disable All Installed Extensions for this Workspace"), original: 'Disable All Installed Extensions for this Workspace' },
@@ -816,7 +819,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
}); });
} }
}); });
}
const extensionsFilterSubMenu = new MenuId('extensionsFilterSubMenu'); const extensionsFilterSubMenu = new MenuId('extensionsFilterSubMenu');
MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, <ISubmenuItem>{ MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, <ISubmenuItem>{
submenu: extensionsFilterSubMenu, submenu: extensionsFilterSubMenu,

3
src/vs/workbench/electron-sandbox/desktop.contribution.ts
View File

@@ -110,6 +110,7 @@ import * as locConstants from 'sql/base/common/locConstants'; // {{SQL CARBON ED
// Menu // Menu
(function registerMenu(): void { (function registerMenu(): void {
if (product.quality !== 'saw') { // {{SQL CARBON EDIT}} - Remove items that are not required
MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, { // {{SQL CARBON EDIT}} - Add install VSIX menu item MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, { // {{SQL CARBON EDIT}} - Add install VSIX menu item
group: '5.1_installExtension', group: '5.1_installExtension',
command: { command: {
@@ -117,7 +118,7 @@ import * as locConstants from 'sql/base/common/locConstants'; // {{SQL CARBON ED
title: locConstants.desktopContributionMiinstallVsix title: locConstants.desktopContributionMiinstallVsix
} }
}); });
}
MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, { MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
group: '6_close', group: '6_close',