Fixed warning for configuration "files.encoding"

Author: edgardmessias

src/svn.ts

@@ -95,6 +95,9 @@ export class Svn {
       args.push("--password", options.password);
     }
 
+    let encoding = options.encoding || "utf8";
+    delete options.encoding;
+
     const process = cp.spawn(this.svnPath, args, options);
 
     const disposables: IDisposable[] = [];
@@ -138,10 +141,6 @@ export class Svn {
 
     dispose(disposables);
 
-    let encoding = workspace
-      .getConfiguration("files")
-      .get<string>("encoding", "utf8");
-
     // SVN with '--xml' always return 'UTF-8', and jschardet detects this encoding: 'TIS-620'
     if (args.includes("--xml")) {
       encoding = "utf8";

src/svnRepository.ts

@@ -1,5 +1,6 @@
 import * as fs from "fs";
 import * as path from "path";
+import { Uri, workspace } from "vscode";
 import {
   ICpOptions,
   IExecutionResult,
@@ -130,6 +131,7 @@ export class Repository {
     revision?: string,
     options: ICpOptions = {}
   ): Promise<string> {
+    const uri = Uri.file(file);
     file = this.removeAbsolutePath(file);
     const args = ["cat"];
 
@@ -147,7 +149,11 @@ export class Repository {
       args.push(file);
     }
 
-    const result = await this.exec(args);
+    const encoding = workspace
+      .getConfiguration("files", uri)
+      .get<string>("encoding", "utf8");
+
+    const result = await this.exec(args, { encoding });
 
     return result.stdout;
   }