Fix ambiguous reference

odersky · cheeseng · commit 3457a4eef455 · 2020-05-08T16:43:10.000+08:00
diff --git a/scalatest/src/main/scala/org/scalatest/flatspec/AnyFlatSpecLike.scala b/scalatest/src/main/scala/org/scalatest/flatspec/AnyFlatSpecLike.scala
@@ -28,7 +28,7 @@ import verbs.{ResultOfTaggedAsInvocation, ResultOfStringPassedToVerb, BehaveWord
  * Implementation trait for class <code>AnyFlatSpec</code>, which facilitates a
  * &ldquo;behavior-driven&rdquo; style of development (BDD), in which tests
  * are combined with text that specifies the behavior the tests verify.
- * 
+ *
  * <p>
  * <a href="AnyFlatSpec.html"><code>AnyFlatSpec</code></a> is a class, not a trait,
  * to minimize compile time given there is a slight compiler overhead to
@@ -204,7 +204,7 @@ trait AnyFlatSpecLike extends TestSuite with TestRegistration with ShouldVerb wi
    * </pre>
    *
    * <p>
-   * For more information and examples of the use of the <code>behavior</code> field, see the main documentation 
+   * For more information and examples of the use of the <code>behavior</code> field, see the main documentation
    * for this trait.
    * </p>
    */
@@ -470,7 +470,7 @@ trait AnyFlatSpecLike extends TestSuite with TestRegistration with ShouldVerb wi
    * </pre>
    *
    * <p>
-   * For more information and examples of the use of the <code>it</code> field, see the main documentation 
+   * For more information and examples of the use of the <code>it</code> field, see the main documentation
    * for this trait.
    * </p>
    */
@@ -613,7 +613,7 @@ trait AnyFlatSpecLike extends TestSuite with TestRegistration with ShouldVerb wi
    * </pre>
    *
    * <p>
-   * For more information and examples of the use of the <code>it</code> field, see the main documentation 
+   * For more information and examples of the use of the <code>it</code> field, see the main documentation
    * for this trait.
    * </p>
    */
@@ -924,7 +924,7 @@ trait AnyFlatSpecLike extends TestSuite with TestRegistration with ShouldVerb wi
    * </p>
    */
   protected val ignore = new IgnoreWord
-  
+
   /**
    * Class that supports the registration of tagged tests via the <code>TheyWord</code> instance
    * referenced from <code>AnyFlatSpec</code>'s <code>they</code> field.
@@ -1185,7 +1185,7 @@ trait AnyFlatSpecLike extends TestSuite with TestRegistration with ShouldVerb wi
    * </pre>
    *
    * <p>
-   * For more information and examples of the use of the <code>it</code> field, see the main documentation 
+   * For more information and examples of the use of the <code>it</code> field, see the main documentation
    * for this trait.
    * </p>
    */
@@ -1328,7 +1328,7 @@ trait AnyFlatSpecLike extends TestSuite with TestRegistration with ShouldVerb wi
    * </pre>
    *
    * <p>
-   * For more information and examples of the use of the <code>it</code> field, see the main documentation 
+   * For more information and examples of the use of the <code>it</code> field, see the main documentation
    * for this trait.
    * </p>
    */
@@ -1398,7 +1398,7 @@ import resultOfStringPassedToVerb.verb
     def in(testFun: => Any /* Assertion */)(implicit pos: source.Position): Unit = {
       registerTestToRun(verb.trim + " " + rest.trim, "in", List(), () => testFun, pos)
     }
-    
+
     /**
      * Supports the registration of ignored tests in shorthand form.
      *
@@ -1430,7 +1430,7 @@ import resultOfStringPassedToVerb.verb
    */
   protected implicit def convertToInAndIgnoreMethods(resultOfStringPassedToVerb: ResultOfStringPassedToVerb): InAndIgnoreMethods =
     new InAndIgnoreMethods(resultOfStringPassedToVerb)
-  
+
   /**
    * Class that supports tagged test registration in shorthand form.
    *
@@ -1562,17 +1562,17 @@ import resultOfStringPassedToVerb.verb
         new ResultOfStringPassedToVerb(verb, rest) {
 
           def is(testFun: => PendingStatement): Unit = {
-            registerTestToRun(verb.trim + " " + rest.trim, "is", List(), () => { testFun; succeed }, pos)
+            registerTestToRun(this.verb.trim + " " + this.rest.trim, "is", List(), () => { testFun; succeed }, pos)
           }
           // Note, won't have an is method that takes fixture => PendingStatement one, because don't want
           // to say is (fixture => pending), rather just say is (pending)
           def taggedAs(firstTestTag: Tag, otherTestTags: Tag*) = {
             val tagList = firstTestTag :: otherTestTags.toList
-            new ResultOfTaggedAsInvocation(verb, rest, tagList) {
+            new ResultOfTaggedAsInvocation(this.verb, this.rest, tagList) {
               // "A Stack" should "bla bla" taggedAs(SlowTest) is (pending)
               //                                               ^
               def is(testFun: => PendingStatement): Unit = {
-                registerTestToRun(verb.trim + " " + rest.trim, "is", tags, () => { testFun; succeed }, pos)
+                registerTestToRun(this.verb.trim + " " + this.rest.trim, "is", this.tags, () => { testFun; succeed }, pos)
               }
             }
           }
@@ -1608,7 +1608,7 @@ import resultOfStringPassedToVerb.verb
       }
     }
 
-// TODO: I got a: 
+// TODO: I got a:
 // runsuite:
 // [scalatest] *** RUN ABORTED ***
 // [scalatest]   An exception or error caused a run to abort: Duplicate test name: should return the new exception with the clue string appended, separated by a space char if passed a function that does that (Engine.scala:464)
@@ -1647,12 +1647,12 @@ import resultOfStringPassedToVerb.verb
    * the <code>Set</code> of tags for the test. If this <code>AnyFlatSpec</code> contains no tags, this method returns an empty <code>Map</code>.
    *
    * <p>
-   * This trait's implementation returns tags that were passed as strings contained in <code>Tag</code> objects passed to 
-   * <code>taggedAs</code>. 
+   * This trait's implementation returns tags that were passed as strings contained in <code>Tag</code> objects passed to
+   * <code>taggedAs</code>.
    * </p>
-   * 
+   *
    * <p>
-   * In addition, this trait's implementation will also auto-tag tests with class level annotations.  
+   * In addition, this trait's implementation will also auto-tag tests with class level annotations.
    * For example, if you annotate <code>@Ignore</code> at the class level, all test methods in the class will be auto-annotated with
    * <code>org.scalatest.Ignore</code>.
    * </p>
@@ -1814,7 +1814,7 @@ import resultOfStringPassedToVerb.verb
    * </p>
    */
   protected val behave = new BehaveWord
-  
+
   /**
    * <strong>The <code>styleName</code> lifecycle method has been deprecated and will be removed in a future version of ScalaTest.</strong>
    *
diff --git a/scalatest/src/main/scala/org/scalatest/flatspec/AsyncFlatSpecLike.scala b/scalatest/src/main/scala/org/scalatest/flatspec/AsyncFlatSpecLike.scala
@@ -1564,17 +1564,17 @@ import resultOfStringPassedToVerb.verb
         new ResultOfStringPassedToVerb(verb, rest) {
 
           def is(testFun: => PendingStatement): Unit = {
-            registerPendingTestToRun(verb.trim + " " + rest.trim, "is", List(), () => testFun, pos)
+            registerPendingTestToRun(this.verb.trim + " " + this.rest.trim, "is", List(), () => testFun, pos)
           }
             // Note, won't have an is method that takes fixture => PendingStatement one, because don't want
           // to say is (fixture => pending), rather just say is (pending)
           def taggedAs(firstTestTag: Tag, otherTestTags: Tag*) = {
             val tagList = firstTestTag :: otherTestTags.toList
-            new ResultOfTaggedAsInvocation(verb, rest, tagList) {
+            new ResultOfTaggedAsInvocation(this.verb, this.rest, tagList) {
               // "A Stack" should "bla bla" taggedAs(SlowTest) is (pending)
               //                                               ^
               def is(testFun: => PendingStatement): Unit = {
-                registerPendingTestToRun(verb.trim + " " + rest.trim, "is", tags, () => testFun, pos)
+                registerPendingTestToRun(this.verb.trim + " " + this.rest.trim, "is", this.tags, () => testFun, pos)
               }
             }
           }
diff --git a/scalatest/src/main/scala/org/scalatest/flatspec/FixtureAnyFlatSpecLike.scala b/scalatest/src/main/scala/org/scalatest/flatspec/FixtureAnyFlatSpecLike.scala
@@ -2011,15 +2011,15 @@ import resultOfStringPassedToVerb.verb
         registerFlatBranch(subject, Resources.shouldCannotAppearInsideAnIn, sourceFileName, "apply", stackDepth, 0, Some(pos))
         new ResultOfStringPassedToVerb(verb, rest) {
           def is(testFun: => PendingStatement): Unit = {
-            registerPendingTestToRun(verb.trim + " " + rest.trim, List(), "is", unusedFixtureParam => testFun, pos)
+            registerPendingTestToRun(this.verb.trim + " " + this.rest.trim, List(), "is", unusedFixtureParam => testFun, pos)
           }
           def taggedAs(firstTestTag: Tag, otherTestTags: Tag*) = {
             val tagList = firstTestTag :: otherTestTags.toList
-            new ResultOfTaggedAsInvocation(verb, rest, tagList) {
+            new ResultOfTaggedAsInvocation(this.verb, this.rest, tagList) {
               // "A Stack" must "test this" taggedAs(mytags.SlowAsMolasses) is (pending)
               //                                                            ^
               def is(testFun: => PendingStatement): Unit = {
-                registerPendingTestToRun(verb.trim + " " + rest.trim, tags, "is", new NoArgTestWrapper(() => testFun), pos)
+                registerPendingTestToRun(this.verb.trim + " " + this.rest.trim, this.tags, "is", new NoArgTestWrapper(() => testFun), pos)
               }
             }
           }
@@ -2051,7 +2051,7 @@ import resultOfStringPassedToVerb.verb
    */
   protected implicit val shorthandSharedTestRegistrationFunction: StringVerbBehaveLikeInvocation =
     new StringVerbBehaveLikeInvocation {
-      def apply(subject: String, pos: source.Position): BehaveWord = { 
+      def apply(subject: String, pos: source.Position): BehaveWord = {
         registerFlatBranch(subject, Resources.shouldCannotAppearInsideAnIn, sourceFileName, "apply", 5, 0, Some(pos))
         new BehaveWord
       }
diff --git a/scalatest/src/main/scala/org/scalatest/flatspec/FixtureAsyncFlatSpecLike.scala b/scalatest/src/main/scala/org/scalatest/flatspec/FixtureAsyncFlatSpecLike.scala
@@ -1981,22 +1981,22 @@ import resultOfStringPassedToVerb.verb
    * initialized with the verb and rest parameters (the second and third parameters to
    * the function, respectively).
    * </p>
-   */ 
+   */
   protected implicit val shorthandTestRegistrationFunction: StringVerbStringInvocation =
     new StringVerbStringInvocation {
       def apply(subject: String, verb: String, rest: String, pos: source.Position): ResultOfStringPassedToVerb = {
         registerFlatBranch(subject, Resources.shouldCannotAppearInsideAnIn, pos)
         new ResultOfStringPassedToVerb(verb, rest) {
           def is(testFun: => PendingStatement): Unit = {
-            registerPendingTestToRun(verb.trim + " " + rest.trim, List(), "is", unusedFixtureParam => testFun, pos)
+            registerPendingTestToRun(this.verb.trim + " " + this.rest.trim, List(), "is", unusedFixtureParam => testFun, pos)
           }
           def taggedAs(firstTestTag: Tag, otherTestTags: Tag*) = {
             val tagList = firstTestTag :: otherTestTags.toList
-            new ResultOfTaggedAsInvocation(verb, rest, tagList) {
+            new ResultOfTaggedAsInvocation(this.verb, this.rest, tagList) {
               // "A Stack" must "test this" taggedAs(mytags.SlowAsMolasses) is (pending)
               //                                                            ^
               def is(testFun: => PendingStatement): Unit = {
-                registerPendingTestToRun(verb.trim + " " + rest.trim, tags, "is", new NoArgTestWrapper(() => testFun), pos)
+                registerPendingTestToRun(this.verb.trim + " " + this.rest.trim, this.tags, "is", new NoArgTestWrapper(() => testFun), pos)
               }
             }
           }

Original file line number	Diff line number	Diff line change
`@@ -1564,17 +1564,17 @@ import resultOfStringPassedToVerb.verb`
`1564`	`1564`	`new ResultOfStringPassedToVerb(verb, rest) {`
`1565`	`1565`
`1566`	`1566`	`def is(testFun: => PendingStatement): Unit = {`
`1567`		`- registerPendingTestToRun(verb.trim + " " + rest.trim, "is", List(), () => testFun, pos)`
	`1567`	`+ registerPendingTestToRun(this.verb.trim + " " + this.rest.trim, "is", List(), () => testFun, pos)`
`1568`	`1568`	`}`
`1569`	`1569`	`// Note, won't have an is method that takes fixture => PendingStatement one, because don't want`
`1570`	`1570`	`// to say is (fixture => pending), rather just say is (pending)`
`1571`	`1571`	`def taggedAs(firstTestTag: Tag, otherTestTags: Tag*) = {`
`1572`	`1572`	`val tagList = firstTestTag :: otherTestTags.toList`
`1573`		`- new ResultOfTaggedAsInvocation(verb, rest, tagList) {`
	`1573`	`+ new ResultOfTaggedAsInvocation(this.verb, this.rest, tagList) {`
`1574`	`1574`	`// "A Stack" should "bla bla" taggedAs(SlowTest) is (pending)`
`1575`	`1575`	`// ^`
`1576`	`1576`	`def is(testFun: => PendingStatement): Unit = {`
`1577`		`- registerPendingTestToRun(verb.trim + " " + rest.trim, "is", tags, () => testFun, pos)`
	`1577`	`+ registerPendingTestToRun(this.verb.trim + " " + this.rest.trim, "is", this.tags, () => testFun, pos)`
`1578`	`1578`	`}`
`1579`	`1579`	`}`
`1580`	`1580`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2011,15 +2011,15 @@ import resultOfStringPassedToVerb.verb`
`2011`	`2011`	`registerFlatBranch(subject, Resources.shouldCannotAppearInsideAnIn, sourceFileName, "apply", stackDepth, 0, Some(pos))`
`2012`	`2012`	`new ResultOfStringPassedToVerb(verb, rest) {`
`2013`	`2013`	`def is(testFun: => PendingStatement): Unit = {`
`2014`		`- registerPendingTestToRun(verb.trim + " " + rest.trim, List(), "is", unusedFixtureParam => testFun, pos)`
	`2014`	`+ registerPendingTestToRun(this.verb.trim + " " + this.rest.trim, List(), "is", unusedFixtureParam => testFun, pos)`
`2015`	`2015`	`}`
`2016`	`2016`	`def taggedAs(firstTestTag: Tag, otherTestTags: Tag*) = {`
`2017`	`2017`	`val tagList = firstTestTag :: otherTestTags.toList`
`2018`		`- new ResultOfTaggedAsInvocation(verb, rest, tagList) {`
	`2018`	`+ new ResultOfTaggedAsInvocation(this.verb, this.rest, tagList) {`
`2019`	`2019`	`// "A Stack" must "test this" taggedAs(mytags.SlowAsMolasses) is (pending)`
`2020`	`2020`	`// ^`
`2021`	`2021`	`def is(testFun: => PendingStatement): Unit = {`
`2022`		`- registerPendingTestToRun(verb.trim + " " + rest.trim, tags, "is", new NoArgTestWrapper(() => testFun), pos)`
	`2022`	`+ registerPendingTestToRun(this.verb.trim + " " + this.rest.trim, this.tags, "is", new NoArgTestWrapper(() => testFun), pos)`
`2023`	`2023`	`}`
`2024`	`2024`	`}`
`2025`	`2025`	`}`
`@@ -2051,7 +2051,7 @@ import resultOfStringPassedToVerb.verb`
`2051`	`2051`	`*/`
`2052`	`2052`	`protected implicit val shorthandSharedTestRegistrationFunction: StringVerbBehaveLikeInvocation =`
`2053`	`2053`	`new StringVerbBehaveLikeInvocation {`
`2054`		`- def apply(subject: String, pos: source.Position): BehaveWord = {`
	`2054`	`+ def apply(subject: String, pos: source.Position): BehaveWord = {`
`2055`	`2055`	`registerFlatBranch(subject, Resources.shouldCannotAppearInsideAnIn, sourceFileName, "apply", 5, 0, Some(pos))`
`2056`	`2056`	`new BehaveWord`
`2057`	`2057`	`}`