removes unused vscode changes (#5533)

This commit is contained in:
Anthony Dresser
2019-05-21 21:48:57 -07:00
committed by GitHub
parent 48a6157efb
commit 2ca39b571a
10 changed files with 6 additions and 51 deletions

View File

@@ -122,11 +122,6 @@ export class ConnectionManagementService extends Disposable implements IConnecti
this._register(this._onAddConnectionProfile);
this._register(this._onDeleteConnectionProfile);
// Refresh editor titles when connections start/end/change to ensure tabs are colored correctly
this.onConnectionChanged(() => this.refreshEditorTitles());
this.onConnect(() => this.refreshEditorTitles());
this.onDisconnect(() => this.refreshEditorTitles());
}
public providerRegistered(providerId: string): boolean {
@@ -1219,7 +1214,6 @@ export class ConnectionManagementService extends Disposable implements IConnecti
public editGroup(group: ConnectionProfileGroup): Promise<any> {
return new Promise<string>((resolve, reject) => {
this._connectionStore.editGroup(group).then(groupId => {
this.refreshEditorTitles();
this._onAddConnectionProfile.fire(undefined);
resolve(null);
}).catch(err => {
@@ -1339,12 +1333,6 @@ export class ConnectionManagementService extends Disposable implements IConnecti
return matchingGroup.color;
}
private refreshEditorTitles(): void {
if (this._editorGroupService instanceof EditorPart) {
this._editorGroupService.refreshEditorTitles();
}
}
public removeConnectionProfileCredentials(originalProfile: IConnectionProfile): IConnectionProfile {
return this._connectionStore.getProfileWithoutPassword(originalProfile);
}

View File

@@ -15,7 +15,6 @@ import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
import { CustomTreeViewPanel } from 'vs/workbench/browser/parts/views/customView';
import { coalesce } from 'vs/base/common/arrays';
import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
import { viewsContainersExtensionPoint } from 'vs/workbench/api/browser/viewsExtensionPoint';
import { CustomTreeView } from 'sql/workbench/browser/parts/views/customView';
@@ -66,7 +65,7 @@ const dataExplorerContribution: IJSONSchema = {
};
const dataExplorerExtensionPoint: IExtensionPoint<{ [loc: string]: IUserFriendlyViewDescriptor[] }> = ExtensionsRegistry.registerExtensionPoint<{ [loc: string]: IUserFriendlyViewDescriptor[] }>({ extensionPoint: 'dataExplorer', deps: [viewsContainersExtensionPoint], jsonSchema: dataExplorerContribution });
const dataExplorerExtensionPoint: IExtensionPoint<{ [loc: string]: IUserFriendlyViewDescriptor[] }> = ExtensionsRegistry.registerExtensionPoint<{ [loc: string]: IUserFriendlyViewDescriptor[] }>({ extensionPoint: 'dataExplorer', jsonSchema: dataExplorerContribution });
class DataExplorerContainerExtensionHandler implements IWorkbenchContribution {

View File

@@ -142,8 +142,7 @@ export interface ICustomViewDescriptor extends ITreeViewDescriptor {
}
type ViewContainerExtensionPointType = { [loc: string]: IUserFriendlyViewsContainerDescriptor[] };
// {{SQL CARBON EDIT}} - Export viewsContainersExtensionPoint
export const viewsContainersExtensionPoint: IExtensionPoint<ViewContainerExtensionPointType> = ExtensionsRegistry.registerExtensionPoint<ViewContainerExtensionPointType>({
const viewsContainersExtensionPoint: IExtensionPoint<ViewContainerExtensionPointType> = ExtensionsRegistry.registerExtensionPoint<ViewContainerExtensionPointType>({
extensionPoint: 'viewsContainers',
jsonSchema: viewsContainersContribution
});

View File

@@ -2187,7 +2187,6 @@ export class DebugAdapterServer implements vscode.DebugAdapterServer {
}
}
// {{SQL CARBON EDIT}}
/*
@es5ClassCompat
export class DebugAdapterImplementation implements vscode.DebugAdapterImplementation {

View File

@@ -32,10 +32,6 @@ import { onUnexpectedError } from 'vs/base/common/errors';
import { Parts, IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
// {{SQL CARBON EDIT}}
import { convertEditorInput } from 'sql/workbench/common/customInputConverter';
interface IEditorPartUIState {
serializedGrid: ISerializedGrid;
activeGroup: GroupIdentifier;
@@ -979,11 +975,6 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
this._onDidLayout.fire(dimension);
}
// {{SQL CARBON EDIT}} -- Allow editor titles to be refreshed to support tab coloring
public refreshEditorTitles(): void {
//this.editorGroupsControl.refreshTitles();
}
protected saveState(): void {
// Persist grid UI state

View File

@@ -444,7 +444,7 @@ export abstract class EditorInput extends Disposable implements IEditorInput {
* Subclasses can set this to false if it does not make sense to split the editor input.
*/
supportsSplitEditor(): boolean {
// {{SQL CARBON EDIT}}
// {{SQL CARBON EDIT}} @anthonydresser 05/19/2019 investigate
return false; // TODO reenable when multiple Angular components of the same type can be open simultaneously
}
@@ -473,7 +473,7 @@ export abstract class EditorInput extends Disposable implements IEditorInput {
super.dispose();
}
// {{SQL CARBON EDIT}}
// {{SQL CARBON EDIT}} @anthonydresser 05/19/2019 investigate
// Saving is not supported in the EditData query editor, so this can be overriden in its Input.
private _savingSupported: boolean = true;
public get savingSupported(): boolean {

View File

@@ -30,7 +30,7 @@ class LogOutputChannels extends Disposable implements IWorkbenchContribution {
outputChannelRegistry.registerChannel({ id: Constants.sharedLogChannelId, label: nls.localize('sharedLog', "Shared"), file: URI.file(join(environmentService.logsPath, `sharedprocess.log`)), log: true });
outputChannelRegistry.registerChannel({ id: Constants.rendererLogChannelId, label: nls.localize('rendererLog', "Window"), file: URI.file(join(environmentService.logsPath, `renderer${environmentService.configuration.windowId}.log`)), log: true });
// {{SQL CARBON EDIT}}
// {{SQL CARBON EDIT}} @anthonydresser 05/19/19 investigate, this should be in the extension
let toolsServiceLogFile: string = join(environmentService.logsPath, '..', '..', 'mssql', `sqltools_${Date.now()}.log`);
console.log(`SqlTools Log file is: ${toolsServiceLogFile}`);
outputChannelRegistry.registerChannel({ id: Constants.sqlToolsLogChannellId, label: nls.localize('sqlToolsLog', "Log (SqlTools)"), file: URI.file(toolsServiceLogFile), log: true });

View File

@@ -150,11 +150,6 @@ export const tocData: ITOCEntry = {
label: localize('terminal', "Terminal"),
settings: ['terminal.*']
},
{
id: 'features/tasks',
label: localize('tasks', "Tasks"),
settings: ['tasks.*']
},
{
id: 'features/problems',
label: localize('problems', "Problems"),

View File

@@ -11,6 +11,7 @@ import * as objects from 'vs/base/common/objects';
import * as platform from 'vs/base/common/platform';
import { dirname } from 'vs/base/common/resources';
import { URI } from 'vs/base/common/uri';
import 'vs/css!./media/search.contribution';
import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
import { getSelectionSearchString } from 'vs/editor/contrib/find/findController';

View File

@@ -2741,7 +2741,6 @@ let schema: IJSONSchema = {
import schemaVersion1 from '../common/jsonSchema_v1';
import schemaVersion2, { updateProblemMatchers } from '../common/jsonSchema_v2';
import { IConfigurationRegistry, Extensions } from 'vs/platform/configuration/common/configurationRegistry';
schema.definitions = {
...schemaVersion1.definitions,
...schemaVersion2.definitions,
@@ -2755,19 +2754,3 @@ ProblemMatcherRegistry.onMatcherChanged(() => {
updateProblemMatchers();
jsonRegistry.notifySchemaChanged(schemaId);
});
const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
configurationRegistry.registerConfiguration({
id: 'Tasks',
order: 100,
title: nls.localize('tasksConfigurationTitle', "Tasks"),
type: 'object',
properties: {
'tasks.terminal.windowsAllowConpty': {
markdownDescription: nls.localize('tasks.terminal.windowsAllowConpty', "Works in conjunction with the `#terminal.integrated.windowsEnableConpty#` setting. Both must be enabled for tasks to use conpty. Defaults to `false`."),
type: 'boolean',
default: false
}
}
});