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

only detect git encoding if files.autoGuessEncoding is enabled

Browse source 
fixes #46826
This commit is contained in:
Joao Moreno 2018-03-28 12:51:24 +02:00
parent 8934ecc3f4
commit 42c882151f
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
extensions/git/src/git.ts
View file

@ -660,9 +660,13 @@ export class Repository {
return result.stdout;
}
async bufferString(object: string, encoding: string = 'utf8'): Promise<string> {
async bufferString(object: string, encoding: string = 'utf8', autoGuessEncoding = false): Promise<string> {
const stdout = await this.buffer(object);
encoding = detectEncoding(stdout) || encoding;
if (autoGuessEncoding) {
encoding = detectEncoding(stdout) || encoding;
}
encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';
return iconv.decode(stdout, encoding);

4
extensions/git/src/repository.ts
View file

@ -815,7 +815,9 @@ export class Repository implements Disposable {
const relativePath = path.relative(this.repository.root, filePath).replace(/\\/g, '/');
const configFiles = workspace.getConfiguration('files', Uri.file(filePath));
const defaultEncoding = configFiles.get<string>('encoding');
return this.repository.bufferString(`${ref}:${relativePath}`, defaultEncoding);
const autoGuessEncoding = configFiles.get<boolean>('autoGuessEncoding');
return this.repository.bufferString(`${ref}:${relativePath}`, defaultEncoding, autoGuessEncoding);
});
}