ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-21 01:25:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode fcf3346a8e9f5ee1e00674461d9e2c2292a14ee3 (#12295)

Browse Source 
* Merge from vscode fcf3346a8e9f5ee1e00674461d9e2c2292a14ee3

* Fix test build break

* Update distro

* Fix build errors

* Update distro

* Update REH build file

* Update build task names for REL

* Fix product build yaml

* Fix product REH task name

* Fix type in task name

* Update linux build step

* Update windows build tasks

* Turn off server publish

* Disable REH

* Fix typo

* Bump distro

* Update vscode tests

* Bump distro

* Fix type in disto

* Bump distro

* Turn off docker build

* Remove docker step from release

Co-authored-by: ADS Merger <andresse@microsoft.com>
Co-authored-by: Karl Burtram <karlb@microsoft.com>
This commit is contained in:
Christopher Suh
2020-10-03 14:42:05 -04:00
committed by GitHub
parent 58d02b76db
commit 6ff1e3866b
687 changed files with 10507 additions and 9104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/workbench/services/notebook/browser/models/cell.ts
View File

@@ -22,7 +22,6 @@ import { optional } from 'vs/platform/instantiation/common/instantiation';
import { getErrorMessage, onUnexpectedError } from 'vs/base/common/errors';
import { generateUuid } from 'vs/base/common/uuid';
import { IModelContentChangedEvent } from 'vs/editor/common/model/textModelEvents';
import { firstIndex, find } from 'vs/base/common/arrays';
import { HideInputTag } from 'sql/platform/notebooks/common/outputRegistry';
import { FutureInternal, notebookConstants } from 'sql/workbench/services/notebook/browser/interfaces';
import { ICommandService } from 'vs/platform/commands/common/commands';
@@ -136,7 +135,7 @@ export class CellModel extends Disposable implements ICellModel {
let tagIndex = -1;
if (this._metadata.tags) {
tagIndex = firstIndex(this._metadata.tags, tag => tag === HideInputTag);
tagIndex = this._metadata.tags.findIndex(tag => tag === HideInputTag);
}
if (this._isCollapsed) {
@@ -786,7 +785,7 @@ export class CellModel extends Disposable implements ICellModel {
if (serverInfo) {
let endpoints: notebookUtils.IEndpoint[] = notebookUtils.getClusterEndpoints(serverInfo);
if (endpoints && endpoints.length > 0) {
endpoint = find(endpoints, ep => ep.serviceName.toLowerCase() === notebookUtils.hadoopEndpointNameGateway);
endpoint = endpoints.find(ep => ep.serviceName.toLowerCase() === notebookUtils.hadoopEndpointNameGateway);
}
}
}

31
src/sql/workbench/services/notebook/browser/models/notebookModel.ts
View File

@@ -24,7 +24,6 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProf
import { uriPrefixes } from 'sql/platform/connection/common/utils';
import { ILogService } from 'vs/platform/log/common/log';
import { getErrorMessage } from 'vs/base/common/errors';
import { find, firstIndex } from 'vs/base/common/arrays';
import { startsWith } from 'vs/base/common/strings';
import { notebookConstants } from 'sql/workbench/services/notebook/browser/interfaces';
import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
@@ -119,18 +118,18 @@ export class NotebookModel extends Disposable implements INotebookModel {
}
public get notebookManager(): INotebookManager {
let manager = find(this.notebookManagers, manager => manager.providerId === this._providerId);
let manager = this.notebookManagers.find(manager => manager.providerId === this._providerId);
if (!manager) {
// Note: this seems like a less than ideal scenario. We should ideally pass in the "correct" provider ID and allow there to be a default,
// instead of assuming in the NotebookModel constructor that the option is either SQL or Jupyter
manager = find(this.notebookManagers, manager => manager.providerId === DEFAULT_NOTEBOOK_PROVIDER);
manager = this.notebookManagers.find(manager => manager.providerId === DEFAULT_NOTEBOOK_PROVIDER);
}
return manager;
}
public getNotebookManager(providerId: string): INotebookManager {
if (providerId) {
return find(this.notebookManagers, manager => manager.providerId === providerId);
return this.notebookManagers.find(manager => manager.providerId === providerId);
}
return undefined;
}
@@ -397,7 +396,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
}
public findCellIndex(cellModel: ICellModel): number {
return firstIndex(this._cells, (cell) => cell.equals(cellModel));
return this._cells.findIndex(cell => cell.equals(cellModel));
}
public addCell(cellType: CellType, index?: number): ICellModel {
@@ -498,7 +497,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
if (this.inErrorState || !this._cells) {
return;
}
let index = firstIndex(this._cells, (cell) => cell.equals(cellModel));
let index = this._cells.findIndex(cell => cell.equals(cellModel));
if (index > -1) {
this._cells.splice(index, 1);
if (this._activeCell === cellModel) {
@@ -548,7 +547,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
public async startSession(manager: INotebookManager, displayName?: string, setErrorStateOnFail?: boolean, kernelAlias?: string): Promise<void> {
if (displayName && this._standardKernels) {
let standardKernel = find(this._standardKernels, kernel => kernel.displayName === displayName);
let standardKernel = this._standardKernels.find(kernel => kernel.displayName === displayName);
if (standardKernel) {
this._defaultKernel = { name: standardKernel.name, display_name: standardKernel.displayName };
}
@@ -653,7 +652,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
private isValidConnection(profile: IConnectionProfile | connection.Connection) {
if (this._standardKernels) {
let standardKernels = find(this._standardKernels, kernel => this._defaultKernel && kernel.displayName === this._defaultKernel.display_name);
let standardKernels = this._standardKernels.find(kernel => this._defaultKernel && kernel.displayName === this._defaultKernel.display_name);
let connectionProviderIds = standardKernels ? standardKernels.connectionProviderIds : undefined;
let providerFeatures = this._capabilitiesService.getCapabilities(profile.providerName);
if (connectionProviderIds?.length) {
@@ -666,14 +665,14 @@ export class NotebookModel extends Disposable implements INotebookModel {
this._kernelDisplayNameToConnectionProviderIds.set(this._currentKernelAlias, [profile.providerName]);
}
}
return this._currentKernelAlias || profile && connectionProviderIds && find(connectionProviderIds, provider => provider === profile.providerName) !== undefined;
return this._currentKernelAlias || profile && connectionProviderIds && connectionProviderIds.find(provider => provider === profile.providerName) !== undefined;
}
return false;
}
public getStandardKernelFromName(name: string): notebookUtils.IStandardKernelWithProvider {
if (name && this._standardKernels) {
let kernel = find(this._standardKernels, kernel => kernel.name.toLowerCase() === name.toLowerCase());
let kernel = this._standardKernels.find(kernel => kernel.name.toLowerCase() === name.toLowerCase());
return kernel;
}
return undefined;
@@ -681,7 +680,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
public getStandardKernelFromDisplayName(displayName: string): notebookUtils.IStandardKernelWithProvider {
if (displayName && this._standardKernels) {
let kernel = find(this._standardKernels, kernel => kernel.displayName.toLowerCase() === displayName.toLowerCase());
let kernel = this._standardKernels.find(kernel => kernel.displayName.toLowerCase() === displayName.toLowerCase());
return kernel;
}
return undefined;
@@ -827,8 +826,8 @@ export class NotebookModel extends Disposable implements INotebookModel {
if (spec) {
// Ensure that the kernel we try to switch to is a valid kernel; if not, use the default
let kernelSpecs = this.getKernelSpecs();
if (kernelSpecs && kernelSpecs.length > 0 && firstIndex(kernelSpecs, k => k.display_name === spec.display_name) < 0) {
spec = find(kernelSpecs, spec => spec.name === this.notebookManager.sessionManager.specs.defaultKernel);
if (kernelSpecs && kernelSpecs.length > 0 && kernelSpecs.findIndex(k => k.display_name === spec.display_name) < 0) {
spec = kernelSpecs.find(spec => spec.name === this.notebookManager.sessionManager.specs.defaultKernel);
}
}
else {
@@ -889,7 +888,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
}
private getKernelSpecFromDisplayName(displayName: string): nb.IKernelSpec {
let kernel: nb.IKernelSpec = find(this.specs.kernels, k => k.display_name.toLowerCase() === displayName.toLowerCase());
let kernel: nb.IKernelSpec = this.specs.kernels.find(k => k.display_name.toLowerCase() === displayName.toLowerCase());
if (!kernel) {
return undefined; // undefined is handled gracefully in the session to default to the default kernel
} else if (!kernel.name) {
@@ -906,7 +905,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
this._savedKernelInfo.display_name = displayName;
}
if (this._standardKernels) {
let standardKernel = find(this._standardKernels, kernel => kernel.displayName === displayName || startsWith(displayName, kernel.displayName));
let standardKernel = this._standardKernels.find(kernel => kernel.displayName === displayName || startsWith(displayName, kernel.displayName));
if (standardKernel && this._savedKernelInfo.name && this._savedKernelInfo.name !== standardKernel.name) {
this._savedKernelInfo.name = standardKernel.name;
this._savedKernelInfo.display_name = standardKernel.displayName;
@@ -920,7 +919,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
if (!specs || !specs.kernels) {
return kernel.name;
}
let newKernel = find(this.notebookManager.sessionManager.specs.kernels, k => k.name === kernel.name);
let newKernel = this.notebookManager.sessionManager.specs.kernels.find(k => k.name === kernel.name);
let newKernelDisplayName;
if (newKernel) {
newKernelDisplayName = newKernel.display_name;

5
src/sql/workbench/services/notebook/browser/sql/sqlSessionManager.ts
View File

@@ -24,7 +24,6 @@ import { ILanguageMagic } from 'sql/workbench/services/notebook/browser/notebook
import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
import { URI } from 'vs/base/common/uri';
import { getUriPrefix, uriPrefixes } from 'sql/platform/connection/common/utils';
import { firstIndex } from 'vs/base/common/arrays';
import { startsWith } from 'vs/base/common/strings';
import { onUnexpectedError } from 'vs/base/common/errors';
import { FutureInternal, notebookConstants } from 'sql/workbench/services/notebook/browser/interfaces';
@@ -75,7 +74,7 @@ export class SqlSessionManager implements nb.SessionManager {
startNew(options: nb.ISessionOptions): Thenable<nb.ISession> {
let sqlSession = new SqlSession(options, this._instantiationService);
let index = firstIndex(SqlSessionManager._sessions, session => session.path === options.path);
let index = SqlSessionManager._sessions.findIndex(session => session.path === options.path);
if (index > -1) {
SqlSessionManager._sessions.splice(index);
}
@@ -84,7 +83,7 @@ export class SqlSessionManager implements nb.SessionManager {
}
shutdown(id: string): Thenable<void> {
let index = firstIndex(SqlSessionManager._sessions, session => session.id === id);
let index = SqlSessionManager._sessions.findIndex(session => session.id === id);
if (index > -1) {
let sessionManager = SqlSessionManager._sessions[index];
SqlSessionManager._sessions.splice(index);