development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-11-05 18:29:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix #38157

Browse source
This commit is contained in:
Sandeep Somavarapu 2017-11-13 12:19:44 +01:00
parent dc46751d22
commit a91380c3d4
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/vs/platform/search/common/search.ts
View file

@ -198,8 +198,9 @@ export function getExcludes(configuration: ISearchConfiguration): glob.IExpressi
}
let allExcludes: glob.IExpression = Object.create(null);
allExcludes = objects.mixin(allExcludes, fileExcludes);
allExcludes = objects.mixin(allExcludes, searchExcludes, true);
// clone the config as it could be frozen
allExcludes = objects.mixin(allExcludes, objects.clone(fileExcludes));
allExcludes = objects.mixin(allExcludes, objects.clone(searchExcludes), true);
return allExcludes;
}

2
src/vs/workbench/browser/parts/editor/editorPart.ts
View file

@ -174,7 +174,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
]
}
*/
this.telemetryService.publicLog('workbenchEditorConfiguration', editorConfig);
this.telemetryService.publicLog('workbenchEditorConfiguration', objects.clone(editorConfig)); // Clone because telemetry service will modify the passed data by adding more details.
} else {
this.tabOptions = {
previewEditors: true,