From c2e4cda64e70288d34ede4cc82622566b393cbd3 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Tue, 23 Oct 2018 10:54:41 -0700 Subject: [PATCH] TextSearchManager - fix tests without fileEncoding --- src/vs/workbench/services/search/node/textSearchManager.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/services/search/node/textSearchManager.ts b/src/vs/workbench/services/search/node/textSearchManager.ts index f1de33b5d32..51e997d2629 100644 --- a/src/vs/workbench/services/search/node/textSearchManager.ts +++ b/src/vs/workbench/services/search/node/textSearchManager.ts @@ -129,7 +129,7 @@ export class TextSearchManager { useIgnoreFiles: !fq.disregardIgnoreFiles, useGlobalIgnoreFiles: !fq.disregardGlobalIgnoreFiles, followSymlinks: !fq.ignoreSymlinks, - encoding: toCanonicalName(fq.fileEncoding), + encoding: fq.fileEncoding && toCanonicalName(fq.fileEncoding), maxFileSize: this.query.maxFileSize, maxResults: this.query.maxResults, previewOptions: this.query.previewOptions -- GitLab