From 3f21188dda8bab50921b63d55cc43999f3ed422a Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 6 Jun 2018 14:58:47 -0700 Subject: [PATCH] Fix #50314 - fix multifolder workspace file encoding in search --- .../workbench/services/search/node/ripgrepTextSearch.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts index 58c31d0ff63..05ecdc78c93 100644 --- a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts +++ b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts @@ -469,9 +469,11 @@ function getRgArgs(config: IRawSearch) { args.push('--follow'); } - // Set default encoding if only one folder is opened - if (config.folderQueries.length === 1 && config.folderQueries[0].fileEncoding && config.folderQueries[0].fileEncoding !== 'utf8') { - args.push('--encoding', encoding.toCanonicalName(config.folderQueries[0].fileEncoding)); + if (config.folderQueries[0]) { + const folder0Encoding = config.folderQueries[0].fileEncoding; + if (folder0Encoding && folder0Encoding !== 'utf8' && config.folderQueries.every(fq => fq.fileEncoding === folder0Encoding)) { + args.push('--encoding', encoding.toCanonicalName(folder0Encoding)); + } } // Ripgrep handles -- as a -- arg separator. Only --. -- GitLab