Fixes #2127. Method name encoding seems off

jruby · Apr 1, 2016 · 2d88cd8 · 2d88cd8
1 parent f568b8d
commit 2d88cd8
Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/core/src/main/java/org/jruby/lexer/LexingCommon.java b/core/src/main/java/org/jruby/lexer/LexingCommon.java
@@ -99,24 +99,23 @@ public ByteList createTokenByteList() {
     }
 
     public String createTokenString(int start) {
-        byte[] bytes = lexb.getUnsafeBytes();
-        int begin = lexb.begin();
-        Charset charset;
+        return createAsEncodedString(lexb.getUnsafeBytes(), lexb.begin() + start, lex_p - start, getEncoding());
+    }
 
+    public String createAsEncodedString(byte[] bytes, int start, int length, Encoding encoding) {
         // FIXME: We should be able to move some faster non-exception cache using Encoding.isDefined
         try {
-            charset = getEncoding().getCharset();
+            Charset charset = getEncoding().getCharset();
             if (charset != null) {
                 if (charset == RubyEncoding.UTF8) {
-                    return RubyEncoding.decodeUTF8(bytes, begin + start, lex_p - start);
+                    return RubyEncoding.decodeUTF8(bytes, start, length);
                 } else {
-                    return new String(bytes, begin + start, lex_p - start, charset);
+                    return new String(bytes, start, length, charset);
                 }
             }
         } catch (UnsupportedCharsetException e) {}
 
-
-        return new String(bytes, begin + start, lex_p - start);
+        return new String(bytes, start, length);
     }
 
     public String createTokenString() {

diff --git a/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java b/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
@@ -318,7 +318,8 @@ public void compile_error(String message) {
 
     // FIXME: How does lexb.toString() vs getCurrentLine() differ.
     public void compile_error(PID pid, String message) {
-        throw new SyntaxException(pid, getFile(), ruby_sourceline, getCurrentLine(), message);
+        String src = createAsEncodedString(lex_lastline.unsafeBytes(), lex_lastline.begin(), lex_lastline.length(), getEncoding());
+        throw new SyntaxException(pid, getFile(), ruby_sourceline, src, message);
     }
 
     public void heredoc_restore(HeredocTerm here) {

diff --git a/test/mri/excludes/TestSyntax.rb b/test/mri/excludes/TestSyntax.rb
@@ -2,12 +2,9 @@
 exclude :test_constant_reassignment_nested, "needs investigation"
 exclude :test_constant_reassignment_toplevel, "needs investigation"
 exclude :test_defined_empty_argument, "needs investigation"
+exclude :test_do_block_in_lambda, "needs investigation"
 exclude :test_duplicated_when, "needs investigation"
-exclude :test_error_message_encoding, "#2127"
 exclude :test_integer_suffix, "needs investigation"
-exclude :test_keyword_duplicated_splat, "fix when dealing w/ mixed sym/str keys"
-exclude :test_keyword_self_reference, "#2124"
-exclude :test_optional_self_reference, "#2124"
-exclude :test_do_block_in_lambda, "needs investigation"
 exclude :test_invalid_next, "needs investigation"
+exclude :test_keyword_duplicated_splat, "fix when dealing w/ mixed sym/str keys"
 exclude :test_null_range_cmdarg, "needs investigation"