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

Merge from vscode e3c4990c67c40213af168300d1cfeb71d680f877 (#16569)

Browse Source
This commit is contained in:
Cory Rivera
2021-08-25 16:28:29 -07:00
committed by GitHub
parent ab1112bfb3
commit cb7b7da0a4
1752 changed files with 59525 additions and 33878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/sql/workbench/contrib/charts/browser/actions.ts
View File

@@ -18,7 +18,6 @@ import { IFileService } from 'vs/platform/files/common/files';
import { IFileDialogService, FileFilter } from 'vs/platform/dialogs/common/dialogs';
import { VSBuffer } from 'vs/base/common/buffer';
import { IOpenerService } from 'vs/platform/opener/common/opener';
import { assign } from 'vs/base/common/objects';
import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
@@ -55,7 +54,7 @@ export class CreateInsightAction extends Action {
let queryFile = uri.fsPath;
let query: string | undefined = undefined;
let type: { [key: string]: any } = {};
let options = assign({}, context.options);
let options = Object.assign({}, context.options);
delete (options as any).type;
type[context.options.type] = options;
// create JSON

3
src/sql/workbench/contrib/charts/browser/imageInsight.ts
View File

@@ -9,7 +9,6 @@ import { $ } from 'vs/base/browser/dom';
import { mixin } from 'vs/base/common/objects';
import { IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/common/interfaces';
import * as nls from 'vs/nls';
import { startsWith } from 'vs/base/common/strings';
import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
export interface IConfig extends IInsightOptions {
@@ -71,7 +70,7 @@ export class ImageInsight implements IInsight {
private static _hexToBase64(hexVal: string) {
if (startsWith(hexVal, '0x')) {
if (hexVal.startsWith('0x')) {
hexVal = hexVal.slice(2);
}
// should be able to be replaced with new Buffer(hexVal, 'hex').toString('base64')