Undo inherit change

dotnet · Sep 7, 2023 · 1a33439 · 1a33439
1 parent 4cdeab0
commit 1a33439
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/src/Compiler/pars.fsy b/src/Compiler/pars.fsy
@@ -2300,10 +2300,9 @@ inheritsDefn:
        SynMemberDefn.ImplicitInherit($2, $4, $5, mDecl) }
 
   | INHERIT ends_coming_soon_or_recover
-     { let mInherit = rhs parseState 1
-       if not $2 then errorR (Error(FSComp.SR.parsTypeNameCannotBeEmpty (), mInherit))
-       let ty = SynType.FromParseError(mInherit.EndRange)
-       SynMemberDefn.Inherit(ty, None, mInherit) }
+     { let mDecl = (rhs parseState 1)
+       if not $2 then errorR (Error(FSComp.SR.parsTypeNameCannotBeEmpty (), mDecl))
+       SynMemberDefn.Inherit(SynType.LongIdent(SynLongIdent([], [], [])), None, mDecl) }
 
 optAsSpec:
   | asSpec

diff --git a/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl
@@ -11,8 +11,9 @@ ImplFile
                      false, None, (3,5--3,6)),
                   ObjectModel
                     (Unspecified,
-                     [Inherit (FromParseError (4,11--4,11), None, (4,4--4,11))],
-                     (4,4--4,11)), [], None, (3,5--4,11),
+                     [Inherit
+                        (LongIdent (SynLongIdent ([], [], [])), None,
+                         (4,4--4,11))], (4,4--4,11)), [], None, (3,5--4,11),
                   { LeadingKeyword = Type (3,0--3,4)
                     EqualsRange = Some (3,7--3,8)
                     WithKeyword = None })], (3,0--4,11))],

diff --git a/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl
@@ -11,8 +11,9 @@ ImplFile
                      false, None, (3,5--3,6)),
                   ObjectModel
                     (Unspecified,
-                     [Inherit (FromParseError (4,11--4,11), None, (4,4--4,11))],
-                     (4,4--4,11)), [], None, (3,5--4,11),
+                     [Inherit
+                        (LongIdent (SynLongIdent ([], [], [])), None,
+                         (4,4--4,11))], (4,4--4,11)), [], None, (3,5--4,11),
                   { LeadingKeyword = Type (3,0--3,4)
                     EqualsRange = Some (3,7--3,8)
                     WithKeyword = None })], (3,0--4,11));

diff --git a/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl
@@ -11,7 +11,9 @@ ImplFile
                      false, None, (3,5--3,6)),
                   ObjectModel
                     (Unspecified,
-                     [Inherit (FromParseError (4,11--4,11), None, (4,4--4,11));
+                     [Inherit
+                        (LongIdent (SynLongIdent ([], [], [])), None,
+                         (4,4--4,11));
                       Member
                         (SynBinding
                            (None, Normal, false, false, [],

diff --git a/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl
@@ -11,7 +11,9 @@ ImplFile
                      false, None, (3,5--3,6)),
                   ObjectModel
                     (Unspecified,
-                     [Inherit (FromParseError (4,11--4,11), None, (4,4--4,11));
+                     [Inherit
+                        (LongIdent (SynLongIdent ([], [], [])), None,
+                         (4,4--4,11));
                       Member
                         (SynBinding
                            (None, Normal, false, false, [],