Continue supporting RBS and Prism

Author: allcre

main/pipeline/pipeline.cc

@@ -271,9 +271,11 @@ parser::ParseResult runPrismParser(core::GlobalState &gs, core::FileRef file, co
         parser::Prism::ParseResult prismResult = parser.parseWithoutTranslation(collectComments);
 
         auto node = prismResult.getRawNodePointer();
-        if (gs.cacheSensitiveOptions.rbsEnabled) {
-            node = runPrismRBSRewrite(gs, file, node, prismResult.getCommentLocations(), print, ctx, parser);
-        }
+        // TODO: Enable once RBS Prism pipeline is fully implemented. For now, we use the legacy RBS rewrite
+        // path (see indexOne): https://github.com/sorbet/sorbet/issues/9065
+        // if (gs.cacheSensitiveOptions.rbsEnabled) {
+        //     node = runPrismRBSRewrite(gs, file, node, prismResult.getCommentLocations(), print, ctx, parser);
+        // }
 
         bool directlyDesugar = !gs.cacheSensitiveOptions.rbsEnabled;
         auto translatedTree = parser::Prism::Translator(parser, ctx, prismResult.getParseErrors(), directlyDesugar,
@@ -464,12 +466,25 @@ ast::ParsedFile indexOne(const options::Options &opts, core::GlobalState &lgs, c
                 }
                 case options::Parser::PRISM: {
                     auto parseResult = runPrismParser(lgs, file, print);
-                    parseTree = move(parseResult.tree);
 
+                    // TODO: Move this check into runPrismParser when it performs rewriting
+                    // https://github.com/sorbet/sorbet/issues/9065
                     if (opts.stopAfterPhase == options::Phase::PARSER) {
                         return emptyParsedFile(file);
                     }
 
+                    // TODO: Remove once RBS Prism pipeline is fully implemented. For now, use the legacy
+                    // RBS rewrite path to ensure RBS support continues to work with Prism.
+                    if (lgs.cacheSensitiveOptions.rbsEnabled) {
+                        parseTree = runRBSRewrite(lgs, file, move(parseResult), print);
+                    } else {
+                        parseTree = move(parseResult.tree);
+                    }
+
+                    if (opts.stopAfterPhase == options::Phase::RBS_REWRITER) {
+                        return emptyParsedFile(file);
+                    }
+
                     break;
                 }
             }