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

More work around isolating node imports (#6512)

Browse Source 
* more work around isolating node imports

* rewrite query plan input

* fix hygiene errors

* fix tests

* address feedback

* remove welcome page changes
This commit is contained in:
Anthony Dresser
2019-07-30 14:01:37 -07:00
committed by GitHub
parent c99ce4de07
commit c1acf6ae93
89 changed files with 1430 additions and 1097 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/platform/actions/common/actions.ts
View File

@@ -95,11 +95,11 @@ export const enum MenuId {
TouchBarContext,
ViewItemContext,
ViewTitle,
// {{SQL CARBON EDIT}}
ObjectExplorerItemContext,
NotebookToolbar,
DataExplorerContext,
DataExplorerAction,
ObjectExplorerItemContext, // {{SQL CARBON EDIT}}
NotebookToolbar, // {{SQL CARBON EDIT}}
DataExplorerContext, // {{SQL CARBON EDIT}}
DataExplorerAction, // {{SQL CARBON EDIT}}
ExplorerWidgetContext, // {{SQL CARBON EDIT}}
CommentThreadTitle,
CommentThreadActions,
CommentTitle,

8
src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
View File

@@ -15,7 +15,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
// {{SQL CARBON EDIT}}
import {
IExtensionManagementService, IExtensionGalleryService, ILocalExtension, IGalleryExtension, IQueryOptions,
InstallExtensionEvent, DidInstallExtensionEvent, DidUninstallExtensionEvent, IExtensionIdentifier, INSTALL_ERROR_INCOMPATIBLE
InstallExtensionEvent, DidInstallExtensionEvent, DidUninstallExtensionEvent, IExtensionIdentifier
} from 'vs/platform/extensionManagement/common/extensionManagement';
import { IExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
import { getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, areSameExtensions, getMaliciousExtensionsSet, groupByExtension, ExtensionIdentifierWithVersion } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
@@ -40,8 +40,6 @@ import { IProductService } from 'vs/platform/product/common/product';
import { asDomUri } from 'vs/base/browser/dom';
// {{SQL CARBON EDIT}}
import { ExtensionManagementError } from 'vs/platform/extensionManagement/node/extensionManagementService';
import pkg from 'vs/platform/product/node/package';
import { isEngineValid } from 'vs/platform/extensions/common/extensionValidator';
interface IExtensionStateProvider<T> {
@@ -835,8 +833,8 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
// Check both the vscode version and azure data studio version
// The check is added here because we want to fail fast instead of downloading the VSIX and then fail.
if (gallery.properties.engine && (!isEngineValid(gallery.properties.engine, this.productService.vscodeVersion)
|| (gallery.properties.azDataEngine && !isEngineValid(gallery.properties.azDataEngine, pkg.version)))) {
return Promise.reject(new ExtensionManagementError(nls.localize('incompatible2', "Unable to install version '{2}' of extension '{0}' as it is not compatible with Azure Data Studio '{1}'.", extension.gallery!.identifier.id, pkg.version, gallery.version), INSTALL_ERROR_INCOMPATIBLE));
|| (gallery.properties.azDataEngine && !isEngineValid(gallery.properties.azDataEngine, this.productService.version)))) {
return Promise.reject(new Error(nls.localize('incompatible2', "Unable to install version '{2}' of extension '{0}' as it is not compatible with Azure Data Studio '{1}'.", extension.gallery!.identifier.id, this.productService.version, gallery.version)));
}
return this.installWithProgress(async () => {

2
src/vs/workbench/contrib/files/browser/fileActions.ts
View File

@@ -50,7 +50,7 @@ import { onUnexpectedError } from 'vs/base/common/errors';
import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
import * as TaskUtilities from 'sql/workbench/common/taskUtilities';
import * as TaskUtilities from 'sql/workbench/browser/taskUtilities';
export const NEW_FILE_COMMAND_ID = 'explorer.newFile';
export const NEW_FILE_LABEL = nls.localize('newFile', "New File");

7
src/vs/workbench/workbench.main.ts
View File

@@ -467,6 +467,7 @@ import 'sql/workbench/parts/tasks/browser/tasks.contribution';
import 'sql/workbench/parts/dataExplorer/browser/dataExplorer.contribution';
import 'sql/workbench/parts/dataExplorer/browser/dataExplorerViewlet';
import 'sql/workbench/parts/dataExplorer/browser/dataExplorerExtensionPoint';
import 'sql/workbench/parts/dataExplorer/common/nodeActions.common.contribution';
import 'sql/workbench/parts/dataExplorer/electron-browser/nodeActions.contribution';
import 'sql/workbench/parts/telemetry/common/telemetry.contribution';
@@ -506,7 +507,8 @@ import 'sql/workbench/parts/dashboard/browser/dashboard.contribution';
import 'sql/workbench/common/actions.contribution';
/* Widgets */
import 'sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidget.contribution';
import 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.contribution';
import 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.common.contribution';
import 'sql/workbench/parts/dashboard/electron-browser/widgets/explorer/explorerWidget.contribution';
import 'sql/workbench/parts/dashboard/browser/widgets/tasks/tasksWidget.contribution';
import 'sql/workbench/parts/dashboard/browser/widgets/webview/webviewWidget.contribution';
import 'sql/workbench/parts/dashboard/browser/dashboardConfig.contribution';
@@ -515,7 +517,8 @@ import 'sql/workbench/browser/modelComponents/components.contribution';
/* View Model Editor */
import 'sql/workbench/browser/modelComponents/modelViewEditor.contribution';
/* Notebook Editor */
import 'sql/workbench/parts/notebook/browser/notebook.contribution';
import 'sql/workbench/parts/notebook/browser/notebook.common.contribution';
import 'sql/workbench/parts/notebook/electron-browser/notebook.contribution';
/* Containers */
import 'sql/workbench/parts/dashboard/browser/containers/dashboardWebviewContainer.contribution';
import 'sql/workbench/parts/dashboard/browser/containers/dashboardControlHostContainer.contribution';