Move magic comment parsing to its own class

Author: eregon

src/main/java/org/truffleruby/RubyFileTypeDetector.java

@@ -20,7 +20,7 @@
 import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.core.encoding.TStringUtils;
 import org.truffleruby.core.string.TStringWithEncoding;
-import org.truffleruby.parser.lexer.RubyLexer;
+import org.truffleruby.parser.MagicCommentParser;
 
 import com.oracle.truffle.api.TruffleFile;
 
@@ -95,7 +95,7 @@ public static RubyEncoding findEncoding(BufferedReader reader) {
                 if (encodingCommentLine != null) {
                     var encodingComment = new TStringWithEncoding(
                             TStringUtils.fromJavaString(encodingCommentLine, Encodings.BINARY), Encodings.BINARY);
-                    var encoding = RubyLexer.parseMagicEncodingComment(encodingComment);
+                    var encoding = MagicCommentParser.parseMagicEncodingComment(encodingComment);
                     if (encoding != null) {
                         return encoding;
                     }

src/main/java/org/truffleruby/language/loader/EvalLoader.java

@@ -16,8 +16,8 @@
 import org.truffleruby.core.string.CannotConvertBinaryRubyStringToJavaString;
 import org.truffleruby.core.string.TStringWithEncoding;
 import org.truffleruby.language.control.RaiseException;
+import org.truffleruby.parser.MagicCommentParser;
 import org.truffleruby.parser.RubySource;
-import org.truffleruby.parser.lexer.RubyLexer;
 import org.truffleruby.shared.TruffleRuby;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -30,7 +30,7 @@ public static RubySource createEvalSource(RubyContext context, AbstractTruffleSt
             RubyEncoding encoding, String method, String file, int line, Node currentNode) {
         var code = new TStringWithEncoding(codeTString.asTruffleStringUncached(encoding.tencoding), encoding);
 
-        var sourceTString = RubyLexer.createSourceTStringBasedOnMagicEncodingComment(code, code.encoding);
+        var sourceTString = MagicCommentParser.createSourceTStringBasedOnMagicEncodingComment(code, code.encoding);
         var sourceEncoding = sourceTString.encoding;
 
         if (!sourceEncoding.isAsciiCompatible) {

src/main/java/org/truffleruby/language/loader/FileLoader.java

@@ -18,8 +18,8 @@
 import org.truffleruby.core.encoding.Encodings;
 import org.truffleruby.core.string.TStringWithEncoding;
 import org.truffleruby.language.control.RaiseException;
+import org.truffleruby.parser.MagicCommentParser;
 import org.truffleruby.parser.RubySource;
-import org.truffleruby.parser.lexer.RubyLexer;
 import org.truffleruby.shared.TruffleRuby;
 
 import com.oracle.truffle.api.TruffleFile;
@@ -70,7 +70,8 @@ public RubySource loadFile(String path) throws IOException {
 
         final byte[] sourceBytes = file.readAllBytes();
 
-        var sourceTString = RubyLexer.createSourceTStringBasedOnMagicEncodingComment(sourceBytes, Encodings.UTF_8);
+        var sourceTString = MagicCommentParser.createSourceTStringBasedOnMagicEncodingComment(sourceBytes,
+                Encodings.UTF_8);
 
         final Source source = buildSource(file, path, sourceTString, isInternal(path), false);
         return new RubySource(source, path, sourceTString);

src/main/java/org/truffleruby/language/loader/MainLoader.java

@@ -17,8 +17,8 @@
 import org.truffleruby.core.encoding.Encodings;
 import org.truffleruby.core.encoding.TStringUtils;
 import org.truffleruby.core.string.TStringWithEncoding;
+import org.truffleruby.parser.MagicCommentParser;
 import org.truffleruby.parser.RubySource;
-import org.truffleruby.parser.lexer.RubyLexer;
 import org.truffleruby.shared.TruffleRuby;
 
 import com.oracle.truffle.api.TruffleFile;
@@ -66,7 +66,7 @@ private TStringWithEncoding transformScript(Node currentNode, String path, byte[
             sourceBytes = embeddedScript.transformForExecution(currentNode, sourceBytes, path);
         }
 
-        return RubyLexer.createSourceTStringBasedOnMagicEncodingComment(sourceBytes, Encodings.UTF_8);
+        return MagicCommentParser.createSourceTStringBasedOnMagicEncodingComment(sourceBytes, Encodings.UTF_8);
     }
 
     private byte[] readAllOfStandardIn() throws IOException {