debt - remove unused encoding method

Benjamin Pasero · Benjamin Pasero · commit d6c36fa74f16 · 2020-04-10T13:41:17.000+02:00
diff --git a/src/vs/base/node/encoding.ts b/src/vs/base/node/encoding.ts
@@ -138,10 +138,6 @@ export function toDecodeStream(readable: Readable, options: IDecodeStreamOptions
 	});
 }
 
-export function decode(buffer: Buffer, encoding: string): string {
-	return iconv.decode(buffer, toNodeEncoding(encoding));
-}
-
 export function encodingExists(encoding: string): boolean {
 	return iconv.encodingExists(toNodeEncoding(encoding));
 }
@@ -154,7 +150,7 @@ export function encodeStream(encoding: string, options?: { addBOM?: boolean }):
 	return iconv.encodeStream(toNodeEncoding(encoding), options);
 }
 
-function toNodeEncoding(enc: string | null): string {
+export function toNodeEncoding(enc: string | null): string {
 	if (enc === UTF8_with_bom || enc === null) {
 		return UTF8; // iconv does not distinguish UTF 8 with or without BOM, so we need to help it
 	}
diff --git a/src/vs/base/test/node/encoding/encoding.test.ts b/src/vs/base/test/node/encoding/encoding.test.ts
@@ -8,6 +8,7 @@ import * as fs from 'fs';
 import * as encoding from 'vs/base/node/encoding';
 import * as terminalEncoding from 'vs/base/node/terminalEncoding';
 import { Readable } from 'stream';
+import * as iconv from 'iconv-lite';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export async function detectEncodingByBOM(file: string): Promise<typeof encoding.UTF16be | typeof encoding.UTF16le | typeof encoding.UTF8_with_bom | null> {
@@ -224,7 +225,7 @@ suite('Encoding', () => {
 				if (err) {
 					reject(err);
 				} else {
-					resolve(encoding.decode(data, fileEncoding!));
+					resolve(iconv.decode(data, encoding.toNodeEncoding(fileEncoding!)));
 				}
 			});
 		});

Original file line number	Diff line number	Diff line change
`@@ -138,10 +138,6 @@ export function toDecodeStream(readable: Readable, options: IDecodeStreamOptions`
`138`	`138`	`});`
`139`	`139`	`}`
`140`	`140`
`141`		`-export function decode(buffer: Buffer, encoding: string): string {`
`142`		`- return iconv.decode(buffer, toNodeEncoding(encoding));`
`143`		`-}`
`144`		`-`
`145`	`141`	`export function encodingExists(encoding: string): boolean {`
`146`	`142`	`return iconv.encodingExists(toNodeEncoding(encoding));`
`147`	`143`	`}`
`@@ -154,7 +150,7 @@ export function encodeStream(encoding: string, options?: { addBOM?: boolean }):`
`154`	`150`	`return iconv.encodeStream(toNodeEncoding(encoding), options);`
`155`	`151`	`}`
`156`	`152`
`157`		`-function toNodeEncoding(enc: string \| null): string {`
	`153`	`+export function toNodeEncoding(enc: string \| null): string {`
`158`	`154`	`if (enc === UTF8_with_bom \|\| enc === null) {`
`159`	`155`	`return UTF8; // iconv does not distinguish UTF 8 with or without BOM, so we need to help it`
`160`	`156`	`}`