Revert "Allow with in refinements"

This reverts commit 280f094.

Author: odersky

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -1566,32 +1566,33 @@ object Parsers {
     def infixTypeRest(t: Tree): Tree =
       infixOps(t, canStartTypeTokens, refinedType, isType = true, isOperator = !isPostfixStar)
 
-    /** RefinedType   ::=  WithType {[nl | ‘with’] Refinement}
+    /** RefinedType   ::=  WithType {[nl] Refinement}
      */
     val refinedType: () => Tree = () => refinedTypeRest(withType())
 
-    def refinedTypeRest(t: Tree): Tree =
+    def refinedTypeRest(t: Tree): Tree = {
       argumentStart()
-      if isTemplateBodyStart then
-        if in.token == WITH then in.nextToken()
+      if (in.isNestedStart)
         refinedTypeRest(atSpan(startOffset(t)) {
           RefinedTypeTree(rejectWildcardType(t), refinement(indentOK = true))
         })
       else t
+    }
 
     /** WithType ::= AnnotType {`with' AnnotType}    (deprecated)
      */
     def withType(): Tree = withTypeRest(annotType())
 
     def withTypeRest(t: Tree): Tree =
-      def isRefinementStart =
-        val la = in.lookahead
-        la.isAfterLineEnd || la.token == LBRACE
-      if in.token == WITH && !isRefinementStart then
+      if in.token == WITH then
+        val withOffset = in.offset
         in.nextToken()
-        if sourceVersion.isAtLeast(`3.1`) then
-          deprecationWarning(DeprecatedWithOperator())
-        atSpan(startOffset(t)) { makeAndType(t, withType()) }
+        if in.token == LBRACE || in.token == INDENT then
+          t
+        else
+          if sourceVersion.isAtLeast(`3.1`) then
+            deprecationWarning(DeprecatedWithOperator(), withOffset)
+          atSpan(startOffset(t)) { makeAndType(t, withType()) }
       else t
 
     /** AnnotType ::= SimpleType {Annotation}

tests/pos/abstract-givens.scala

@@ -10,10 +10,6 @@ trait UU {
   type UX
   val u: UX
   val x: this.type & { type UX = Int }
-  val x1: this.type { type UX = Int }
-  val x2: this.type with { type UX = Int }
-  val x3: this.type with
-    type UX = Int
   val y: Int = x.u
   val z: x.UX = y
 }