Merge from vscode 4636be2b71c87bfb0bfe3c94278b447a5efcc1f1 (#8722)

* Merge from vscode 4636be2b71c87bfb0bfe3c94278b447a5efcc1f1

* remove tests that aren't working
This commit is contained in:
Anthony Dresser
2019-12-18 00:14:28 -08:00
committed by GitHub
parent 0fd870d156
commit 30d9e9c141
289 changed files with 5537 additions and 3039 deletions

View File

@@ -30,6 +30,10 @@ export class FileQueryEditorInputFactory implements IEditorInputFactory {
const queryResultsInput = instantiationService.createInstance(QueryResultsInput, fileEditorInput.getResource().toString());
return instantiationService.createInstance(FileQueryEditorInput, '', fileEditorInput, queryResultsInput);
}
canSerialize(): boolean { // we can always serialize query inputs
return true;
}
}
export class UntitledQueryEditorInputFactory implements IEditorInputFactory {
@@ -47,4 +51,8 @@ export class UntitledQueryEditorInputFactory implements IEditorInputFactory {
const queryResultsInput = instantiationService.createInstance(QueryResultsInput, untitledEditorInput.getResource().toString());
return instantiationService.createInstance(UntitledQueryEditorInput, '', untitledEditorInput, queryResultsInput);
}
canSerialize(): boolean { // we can always serialize query inputs
return true;
}
}

View File

@@ -20,7 +20,6 @@ const resultsGridConfiguration: IConfigurationNode = {
id: 'resultsGrid',
type: 'object',
title: nls.localize('resultsGridConfigurationTitle', "Results Grid and Messages"),
overridable: true,
properties: {
'resultsGrid.fontFamily': {
type: 'string',