development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into misolori/icon-font

Browse source
This commit is contained in:
Miguel Solorio 2019-10-16 14:52:52 -07:00
parent 641276b599 2205002a2c
commit 11941aa090
3 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
View file

@ -132,7 +132,7 @@ export const tocData: ITOCEntry = {
{
id: 'features/search',
label: localize('search', "Search"),
settings: ['search.*', 'searchRipgrep.*']
settings: ['search.*']
}
,
{

11
src/vs/workbench/contrib/search/browser/search.contribution.ts
View file

@ -760,17 +760,6 @@ configurationRegistry.registerConfiguration({
default: false,
description: nls.localize('search.showLineNumbers', "Controls whether to show line numbers for search results."),
},
'searchRipgrep.enable': {
type: 'boolean',
default: false,
deprecationMessage: nls.localize('search.searchRipgrepEnableDeprecated', "Deprecated. Use \"search.runInExtensionHost\" instead"),
description: nls.localize('search.searchRipgrepEnable', "Whether to run search in the extension host")
},
'search.runInExtensionHost': {
type: 'boolean',
default: false,
description: nls.localize('search.runInExtensionHost', "Whether to run search in the extension host. Requires a restart to take effect.")
},
'search.usePCRE2': {
type: 'boolean',
default: false,

2
test/automation/src/problems.ts
View file

@ -39,7 +39,7 @@ export class Problems {
}
public static getSelectorInProblemsView(problemType: ProblemSeverity): string {
let selector = problemType === ProblemSeverity.WARNING ? 'severity-warning' : 'severity-error';
let selector = problemType === ProblemSeverity.WARNING ? 'codicon-warning' : 'codicon-error';
return `div[id="workbench.panel.markers"] .monaco-tl-contents .marker-icon.${selector}`;
}