Skip to content
This repository was archived by the owner on Oct 1, 2024. It is now read-only.

Refine codepage mapping. #369

Merged
merged 1 commit into from
Jul 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions misc/codepageMapping.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"936": "GBK",
"932": "Shift_JIS"
}
35 changes: 12 additions & 23 deletions src/common/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import * as properties from "properties";
import * as vscode from "vscode";
import * as WinReg from "winreg";

const encodingMapping: object = JSON.parse(fs.readFileSync(path.join(__dirname, "../../../misc", "codepageMapping.json"), "utf8"));

/**
* This function will return the VSCode C/C++ extesnion compatible platform literals.
* @function getCppConfigPlatform
Expand Down Expand Up @@ -211,30 +213,10 @@ export function spawn(command: string, outputChannel: vscode.OutputChannel, args

if (outputChannel) {
child.stdout.on("data", (data: Buffer) => {
switch (codepage) {
case "932":
outputChannel.append(iconv.decode(data, "Shift_JIS"));
break;
case "936":
outputChannel.append(iconv.decode(data, "GBK"));
break;
default:
outputChannel.append(data.toString());
break;
}
outputChannel.append(decodeData(data, codepage));
});
child.stderr.on("data", (data: Buffer) => {
switch (codepage) {
case "932":
outputChannel.append(iconv.decode(data, "Shift_JIS"));
break;
case "936":
outputChannel.append(iconv.decode(data, "GBK"));
break;
default:
outputChannel.append(data.toString());
break;
}
outputChannel.append(decodeData(data, codepage));
});
}

Expand All @@ -250,6 +232,13 @@ export function spawn(command: string, outputChannel: vscode.OutputChannel, args
});
}

export function decodeData(data: Buffer, codepage: string): string {
if (encodingMapping.hasOwnProperty(codepage)) {
return iconv.decode(data, encodingMapping[codepage]);
}
return data.toString();
}

export function tryParseJSON(jsonString: string) {
try {
const jsonObj = JSON.parse(jsonString);
Expand Down Expand Up @@ -397,5 +386,5 @@ export function getRegistryValues(hive: string, key: string, name: string): Prom
}

export function convertToHex(number, width = 0) {
return padStart(number.toString(16), width, "0");
return padStart(number.toString(16), width, "0");
}