Merge pull request #53 from filipw/feature/enc

filipw · web-flow · commit 72b52f104f7c · 2017-01-18T09:00:36.000+01:00
do not hardcode any encodings
diff --git a/src/Dotnet.Script.Core/DebugScriptRunner.cs b/src/Dotnet.Script.Core/DebugScriptRunner.cs
@@ -34,7 +34,7 @@ public override Task<TReturn> Execute<TReturn, THost>(ScriptContext context, THo
             {
                 // https://github.com/dotnet/roslyn/blob/version-2.0.0-beta4/src/Compilers/CSharp/Portable/Syntax/CSharpSyntaxTree.ParsedSyntaxTree.cs#L19
                 var encodingField = syntaxTree.GetType().GetField("_encodingOpt", BindingFlags.Instance | BindingFlags.NonPublic);
-                encodingField.SetValue(syntaxTree, Encoding.UTF8);
+                encodingField.SetValue(syntaxTree, context.Code.Encoding);
 
                 // https://github.com/dotnet/roslyn/blob/version-2.0.0-beta4/src/Compilers/CSharp/Portable/Syntax/CSharpSyntaxTree.ParsedSyntaxTree.cs#L21
                 var lazyTextField = syntaxTree.GetType().GetField("_lazyText", BindingFlags.Instance | BindingFlags.NonPublic);
diff --git a/src/Dotnet.Script/Program.cs b/src/Dotnet.Script/Program.cs
@@ -86,15 +86,15 @@ private static void RunScript(string file, string config, bool debugMode, IEnume
             }
 
             var directory = Path.IsPathRooted(file) ? Path.GetDirectoryName(file) : Path.GetDirectoryName(Path.Combine(Directory.GetCurrentDirectory(), file));
-            var sourceText = SourceText.From(new FileStream(file, FileMode.Open), Encoding.UTF8);
+            var sourceText = SourceText.From(new FileStream(file, FileMode.Open));
             var context = new ScriptContext(sourceText, directory, config, args, file);
 
             Run(debugMode, context);
         }
 
         private static void RunCode(string code, string config, bool debugMode, IEnumerable<string> args, string currentWorkingDirectory)
         {
-            var sourceText = SourceText.From(code, Encoding.UTF8);
+            var sourceText = SourceText.From(code);
             var context = new ScriptContext(sourceText, currentWorkingDirectory ?? Directory.GetCurrentDirectory(), config, args);
 
             Run(debugMode, context);

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public override Task<TReturn> Execute<TReturn, THost>(ScriptContext context, THo`
`34`	`34`	`{`
`35`	`35`	`// https://github.com/dotnet/roslyn/blob/version-2.0.0-beta4/src/Compilers/CSharp/Portable/Syntax/CSharpSyntaxTree.ParsedSyntaxTree.cs#L19`
`36`	`36`	`var encodingField = syntaxTree.GetType().GetField("_encodingOpt", BindingFlags.Instance \| BindingFlags.NonPublic);`
`37`		`- encodingField.SetValue(syntaxTree, Encoding.UTF8);`
	`37`	`+ encodingField.SetValue(syntaxTree, context.Code.Encoding);`
`38`	`38`
`39`	`39`	`// https://github.com/dotnet/roslyn/blob/version-2.0.0-beta4/src/Compilers/CSharp/Portable/Syntax/CSharpSyntaxTree.ParsedSyntaxTree.cs#L21`
`40`	`40`	`var lazyTextField = syntaxTree.GetType().GetField("_lazyText", BindingFlags.Instance \| BindingFlags.NonPublic);`
Original file line number	Diff line number	Diff line change
`@@ -86,15 +86,15 @@ private static void RunScript(string file, string config, bool debugMode, IEnume`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`var directory = Path.IsPathRooted(file) ? Path.GetDirectoryName(file) : Path.GetDirectoryName(Path.Combine(Directory.GetCurrentDirectory(), file));`
`89`		`- var sourceText = SourceText.From(new FileStream(file, FileMode.Open), Encoding.UTF8);`
	`89`	`+ var sourceText = SourceText.From(new FileStream(file, FileMode.Open));`
`90`	`90`	`var context = new ScriptContext(sourceText, directory, config, args, file);`
`91`	`91`
`92`	`92`	`Run(debugMode, context);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`private static void RunCode(string code, string config, bool debugMode, IEnumerable<string> args, string currentWorkingDirectory)`
`96`	`96`	`{`
`97`		`- var sourceText = SourceText.From(code, Encoding.UTF8);`
	`97`	`+ var sourceText = SourceText.From(code);`
`98`	`98`	`var context = new ScriptContext(sourceText, currentWorkingDirectory ?? Directory.GetCurrentDirectory(), config, args);`
`99`	`99`
`100`	`100`	`Run(debugMode, context);`