GreatSyntacticShift: Disable complex token merging in type ref parsing, to fulfill kt307.jet test

2011-12-21 11:30:06 +02:00
parent f73b7522b9
commit a3880923e1
2 changed files with 7 additions and 4 deletions
@@ -1286,7 +1286,10 @@ public class JetParsing extends AbstractJetParsing {
    }

    private PsiBuilder.Marker parseTypeRefContents() {
-        myBuilder.disableJoiningComplexTokens();
+        // Disabling token merge is required for cases like
+        //    Int?.(Foo) -> Bar
+        // we don't support this case now
+//        myBuilder.disableJoiningComplexTokens();
        PsiBuilder.Marker typeRefMarker = mark();
        parseAnnotations(false);

@@ -1365,7 +1368,7 @@ public class JetParsing extends AbstractJetParsing {

            precede.done(FUNCTION_TYPE);
        }
-        myBuilder.restoreJoiningComplexTokensState();
+//        myBuilder.restoreJoiningComplexTokensState();
        return typeRefMarker;
    }