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

Merge from vscode 3d67364fbfcf676d93be64f949e9b33e7f1b969e (#5028)

Browse Source
This commit is contained in:
Anthony Dresser
2019-04-14 22:29:14 -07:00
committed by GitHub
parent 6dbf757385
commit 57242a2e13
210 changed files with 4898 additions and 3018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/workbench/browser/nodeless.main.ts
View File

@@ -20,6 +20,7 @@ import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remot
import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
import { IFileService } from 'vs/platform/files/common/files';
import { FileService3 } from 'vs/workbench/services/files2/browser/fileService2';
import { Schemas } from 'vs/base/common/network';
class CodeRendererMain extends Disposable {
@@ -84,7 +85,7 @@ class CodeRendererMain extends Disposable {
if (connection) {
const channel = connection.getChannel<IChannel>(REMOTE_FILE_SYSTEM_CHANNEL_NAME);
const remoteFileSystemProvider = this._register(new RemoteExtensionsFileSystemProvider(channel, remoteAgentService.getEnvironment()));
fileService.registerProvider('vscode-remote', remoteFileSystemProvider);
fileService.registerProvider(Schemas.vscodeRemote, remoteFileSystemProvider);
}
return { serviceCollection, logService };

5
src/vs/workbench/browser/nodeless.simpleservices.ts
View File

@@ -61,7 +61,7 @@ import { ITunnelService } from 'vs/platform/remote/common/tunnel';
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
export const workspaceResource = URI.from({
scheme: 'vscode-remote',
scheme: Schemas.vscodeRemote,
authority: document.location.host,
path: (<any>self).USER_HOME_DIR || '/'
});
@@ -821,6 +821,9 @@ export class SimpleTelemetryService implements ITelemetryService {
return Promise.resolve(undefined);
}
setEnabled(value: boolean): void {
}
getTelemetryInfo(): Promise<ITelemetryInfo> {
return Promise.resolve({
instanceId: 'someValue.instanceId',

4
src/vs/workbench/browser/parts/editor/editor.contribution.ts
View File

@@ -5,7 +5,7 @@
import { Registry } from 'vs/platform/registry/common/platform';
import * as nls from 'vs/nls';
import { URI } from 'vs/base/common/uri';
import { URI, UriComponents } from 'vs/base/common/uri';
import { Action, IAction } from 'vs/base/common/actions';
import { IEditorQuickOpenEntry, IQuickOpenRegistry, Extensions as QuickOpenExtensions, QuickOpenHandlerDescriptor } from 'vs/workbench/browser/quickopen';
import { StatusbarItemDescriptor, IStatusbarRegistry, Extensions as StatusExtensions } from 'vs/workbench/browser/parts/statusbar/statusbar';
@@ -147,7 +147,7 @@ class UntitledEditorInputFactory implements IEditorInputFactory {
deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): UntitledEditorInput {
return instantiationService.invokeFunction<UntitledEditorInput>(accessor => {
const deserialized: ISerializedUntitledEditorInput = JSON.parse(serializedEditorInput);
const resource = !!deserialized.resourceJSON ? URI.revive(deserialized.resourceJSON) : URI.parse(deserialized.resource);
const resource = !!deserialized.resourceJSON ? URI.revive(<UriComponents>deserialized.resourceJSON) : URI.parse(deserialized.resource);
const filePath = resource.scheme === Schemas.untitled ? undefined : resource.scheme === Schemas.file ? resource.fsPath : resource.path;
const language = deserialized.modeId;
const encoding = deserialized.encoding;

2
src/vs/workbench/browser/parts/editor/editorWidgets.ts
View File

@@ -163,7 +163,7 @@ export class OpenWorkspaceButtonContribution extends Disposable implements IEdit
this._register(this.openWorkspaceButton.onClick(() => {
const model = this.editor.getModel();
if (model) {
this.windowService.openWindow([{ fileUri: model.uri }]);
this.windowService.openWindow([{ workspaceUri: model.uri }]);
}
}));

2
src/vs/workbench/browser/parts/editor/resourceViewer.ts
View File

@@ -108,7 +108,7 @@ export class ResourceViewer {
}
class ImageView {
private static readonly MAX_IMAGE_SIZE = BinarySize.MB; // showing images inline is memory intense, so we have a limit
private static readonly MAX_IMAGE_SIZE = BinarySize.MB * 10; // showing images inline is memory intense, so we have a limit
private static readonly BASE64_MARKER = 'base64,';
static create(

3
src/vs/workbench/browser/parts/views/panelViewlet.ts
View File

@@ -266,7 +266,8 @@ export class PanelViewlet extends Viewlet {
let title = Registry.as<ViewletRegistry>(Extensions.Viewlets).getViewlet(this.getId()).name;
if (this.isSingleView()) {
title = `${title}: ${this.panelItems[0].panel.title}`;
const panelItemTitle = this.panelItems[0].panel.title;
title = panelItemTitle ? `${title}: ${panelItemTitle}` : title;
}
return title;