development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-06 11:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #69114

Browse source
This commit is contained in:
Rob Lourens 2019-02-27 09:52:01 -08:00
parent e2049cdca3
commit 0acb390180
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/vs/workbench/contrib/preferences/electron-browser/preferencesSearch.ts
View file

@ -260,20 +260,25 @@ class RemoteSearchProvider implements ISearchProvider {
}
const requestType = details.body ? 'post' : 'get';
const headers = {
'User-Agent': 'request',
'Content-Type': 'application/json; charset=utf-8',
};
if (this.options.endpoint.key) {
headers['api-key'] = this.options.endpoint.key;
}
const start = Date.now();
return this.requestService.request({
type: requestType,
url: details.url,
data: details.body,
headers: {
'User-Agent': 'request',
'Content-Type': 'application/json; charset=utf-8',
'api-key': this.options.endpoint.key
},
headers,
timeout: 5000
}, CancellationToken.None).then(context => {
if (context.res.statusCode >= 300) {
throw new Error(`${details} returned status code: ${context.res.statusCode}`);
throw new Error(`${JSON.stringify(details)} returned status code: ${context.res.statusCode}`);
}
return asJson(context);
@ -319,8 +324,7 @@ class RemoteSearchProvider implements ISearchProvider {
duration,
timestamp,
scoredResults,
context: result['@odata.context'],
extensions: details.extensions
context: result['@odata.context']
};
});
}
@ -374,8 +378,7 @@ class RemoteSearchProvider implements ISearchProvider {
return {
url,
body,
hasMoreFilters,
extensions
hasMoreFilters
};
}

2
src/vs/workbench/services/preferences/common/preferences.ts
View file

@ -12,7 +12,6 @@ import { localize } from 'vs/nls';
import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
import { IEditorOptions } from 'vs/platform/editor/common/editor';
import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { EditorOptions, IEditor } from 'vs/workbench/common/editor';
@ -123,7 +122,6 @@ export interface IFilterMetadata {
timestamp: number;
duration: number;
scoredResults: IScoredResults;
extensions?: ILocalExtension[];
/** The number of requests made, since requests are split by number of filters */
requestCount?: number;