Addressed CR feedback.
This commit is contained in:
parent
aac8b3fae5
commit
b371b02ea0
2 changed files with 8 additions and 18 deletions
|
@ -27,10 +27,6 @@ declare var module: any;
|
|||
declare var process: any;
|
||||
declare var global: any;
|
||||
|
||||
enum SystemError {
|
||||
UnsupportedFileEncoding
|
||||
}
|
||||
|
||||
var sys: System = (function () {
|
||||
|
||||
function getWScriptSystem(): System {
|
||||
|
@ -72,9 +68,7 @@ var sys: System = (function () {
|
|||
return fileStream.ReadText();
|
||||
}
|
||||
catch (e) {
|
||||
if (e.number === -2147024809) {
|
||||
e.systemError = SystemError.UnsupportedFileEncoding;
|
||||
}
|
||||
throw e;
|
||||
}
|
||||
finally {
|
||||
fileStream.Close();
|
||||
|
|
|
@ -72,15 +72,6 @@ module ts {
|
|||
return true;
|
||||
}
|
||||
|
||||
function getSystemErrorMessage(e: SystemError): string {
|
||||
switch (e) {
|
||||
case SystemError.UnsupportedFileEncoding:
|
||||
return getDiagnosticText(Diagnostics.Unsupported_file_encoding);
|
||||
default:
|
||||
Debug.assert("Unreachable code in 'getSystemErrorMessage'");
|
||||
}
|
||||
}
|
||||
|
||||
function countLines(program: Program): number {
|
||||
var count = 0;
|
||||
forEach(program.getSourceFiles(), file => {
|
||||
|
@ -152,13 +143,18 @@ module ts {
|
|||
return sys.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
|
||||
}
|
||||
|
||||
// returned by CScript sys environment
|
||||
var unsupportedFileEncodingErrorCode = -2147024809;
|
||||
|
||||
function getSourceFile(filename: string, languageVersion: ScriptTarget, onError?: (message: string) => void): SourceFile {
|
||||
try {
|
||||
var text = sys.readFile(filename, options.charset);
|
||||
}
|
||||
catch (e) {
|
||||
if (onError) {
|
||||
onError(e.systemError ? getSystemErrorMessage(e.systemError) : e.message);
|
||||
onError(e.number === unsupportedFileEncodingErrorCode ?
|
||||
getDiagnosticText(Diagnostics.Unsupported_file_encoding) :
|
||||
e.message);
|
||||
}
|
||||
text = "";
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue