ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-30 08:40:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

removes unused vscode changes (#5533)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/contrib/logs/common/logs.contribution.ts
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 });

5
src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
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"),

1
src/vs/workbench/contrib/search/browser/search.contribution.ts
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';

17
src/vs/workbench/contrib/tasks/electron-browser/task.contribution.ts
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
}
}
});