Skip to content

Diagrams Macro Fix #2219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 8 commits into from
Jan 3, 2023
Merged

Diagrams Macro Fix #2219

merged 8 commits into from
Jan 3, 2023

Conversation

cheeseng
Copy link
Contributor

Fixed future get executed 2x problem as reported in this issue:

#2218

@cla-bot cla-bot bot added the cla-signed label Dec 28, 2022
@cheeseng cheeseng mentioned this pull request Dec 28, 2022
Open
@cheeseng
Copy link
Contributor Author

@bvenners fyi here's the before and after macro expansion for reference:

Before:

###debug: {
  val $org_scalatest_assert_macro_expr = {
    val $org_scalatest_macro_qualifier = {
      val $org_scalatest_macro_qualifier = _root_.org.scalatest.diagrams.DiagrammedExpr.simpleExpr(scala.concurrent.Await, 15);
      val $org_scalatest_macro_arg_100 = {
        val $org_scalatest_macro_qualifier = _root_.org.scalatest.diagrams.DiagrammedExpr.simpleExpr(scala.concurrent.Future, 28);
        val $org_scalatest_macro_arg_100 = _root_.org.scalatest.diagrams.DiagrammedExpr.simpleExpr("", -1);
        val $org_scalatest_macro_arg_200 = {
          val $org_scalatest_macro_qualifier = _root_.org.scalatest.diagrams.DiagrammedExpr.simpleExpr(scala.concurrent.ExecutionContext.Implicits, 35);
          _root_.org.scalatest.diagrams.DiagrammedExpr.selectExpr($org_scalatest_macro_qualifier, $org_scalatest_macro_qualifier.value.global, 35)
        };
        _root_.org.scalatest.diagrams.DiagrammedExpr.applyExpr($org_scalatest_macro_qualifier, scala.collection.immutable.List.apply($org_scalatest_macro_arg_100, $org_scalatest_macro_arg_200), $org_scalatest_macro_qualifier.value.apply[Int]({
          count = count.+(1);
          42
        })(scala.concurrent.ExecutionContext.Implicits.global), 28)
      };
      val $org_scalatest_macro_arg_101 = {
        val $org_scalatest_macro_qualifier = _root_.org.scalatest.diagrams.DiagrammedExpr.simpleExpr(scala.concurrent.duration.Duration, 62);
        val $org_scalatest_macro_arg_0 = _root_.org.scalatest.diagrams.DiagrammedExpr.simpleExpr(1L, 71);
        val $org_scalatest_macro_arg_1 = _root_.org.scalatest.diagrams.DiagrammedExpr.simpleExpr(SECONDS, 74);
        _root_.org.scalatest.diagrams.DiagrammedExpr.applyExpr($org_scalatest_macro_qualifier, scala.collection.immutable.List.apply($org_scalatest_macro_arg_0, $org_scalatest_macro_arg_1), $org_scalatest_macro_qualifier.value.apply(1L, SECONDS), 62)
      };
      _root_.org.scalatest.diagrams.DiagrammedExpr.applyExpr($org_scalatest_macro_qualifier, scala.collection.immutable.List.apply($org_scalatest_macro_arg_100, $org_scalatest_macro_arg_101), $org_scalatest_macro_qualifier.value.result[Int](scala.concurrent.Future.apply[Int]({
        count = count.+(1);
        42
      })(scala.concurrent.ExecutionContext.Implicits.global), scala.concurrent.duration.Duration.apply(1L, SECONDS)), 21)
    };
    val $org_scalatest_macro_arg_0 = _root_.org.scalatest.diagrams.DiagrammedExpr.simpleExpr(42, 87);
    _root_.org.scalatest.diagrams.DiagrammedExpr.applyExpr($org_scalatest_macro_qualifier, scala.collection.immutable.List.apply($org_scalatest_macro_arg_0), $org_scalatest_macro_qualifier.value.$eq$eq(42), 84)
  };
  _root_.org.scalatest.diagrams.Diagrams.diagrammedAssertionsHelper.macroAssert($org_scalatest_assert_macro_expr, "", "        assert(Await.result(Future { count = count + 1; 42 }, Duration(1, SECONDS)) == 42)", (Position.apply("DiagramsSpec.scala", "Please set the environment variable SCALACTIC_FILL_FILE_PATHNAMES to yes at compile time to enable this feature.", 2597): org.scalactic.source.Position))
}

After:

###debug: {
  val $org_scalatest_assert_macro_expr = {
    val $org_scalatest_macro_qualifier = {
      val $org_scalatest_macro_qualifier = _root_.org.scalatest.diagrams.DiagrammedExpr.simpleExpr(scala.concurrent.Await, 47);
      val $org_scalatest_macro_arg_100 = {
        val $org_scalatest_macro_qualifier = _root_.org.scalatest.diagrams.DiagrammedExpr.simpleExpr(scala.concurrent.Future, 60);
        val $org_scalatest_macro_arg_100 = _root_.org.scalatest.diagrams.DiagrammedExpr.byNameExpr({
          count = count.+(1);
          42
        }, 67);
        val $org_scalatest_macro_arg_200 = {
          val $org_scalatest_macro_qualifier = _root_.org.scalatest.diagrams.DiagrammedExpr.simpleExpr(scala.concurrent.ExecutionContext.Implicits, 67);
          _root_.org.scalatest.diagrams.DiagrammedExpr.selectExpr($org_scalatest_macro_qualifier, $org_scalatest_macro_qualifier.value.global, 67)
        };
        _root_.org.scalatest.diagrams.DiagrammedExpr.applyExpr($org_scalatest_macro_qualifier, scala.collection.immutable.List.apply($org_scalatest_macro_arg_100, $org_scalatest_macro_arg_200), $org_scalatest_macro_qualifier.value.apply[Int]($org_scalatest_macro_arg_100.value.apply())($org_scalatest_macro_arg_200.value), 60)
      };
      val $org_scalatest_macro_arg_101 = {
        val $org_scalatest_macro_qualifier = _root_.org.scalatest.diagrams.DiagrammedExpr.simpleExpr(scala.concurrent.duration.Duration, 94);
        val $org_scalatest_macro_arg_0 = _root_.org.scalatest.diagrams.DiagrammedExpr.simpleExpr(1L, 103);
        val $org_scalatest_macro_arg_1 = _root_.org.scalatest.diagrams.DiagrammedExpr.simpleExpr(SECONDS, 106);
        _root_.org.scalatest.diagrams.DiagrammedExpr.applyExpr($org_scalatest_macro_qualifier, scala.collection.immutable.List.apply($org_scalatest_macro_arg_0, $org_scalatest_macro_arg_1), $org_scalatest_macro_qualifier.value.apply($org_scalatest_macro_arg_0.value, $org_scalatest_macro_arg_1.value), 94)
      };
      _root_.org.scalatest.diagrams.DiagrammedExpr.applyExpr($org_scalatest_macro_qualifier, scala.collection.immutable.List.apply($org_scalatest_macro_arg_100, $org_scalatest_macro_arg_101), $org_scalatest_macro_qualifier.value.result[Int]($org_scalatest_macro_arg_100.value, $org_scalatest_macro_arg_101.value), 53)
    };
    val $org_scalatest_macro_arg_0 = _root_.org.scalatest.diagrams.DiagrammedExpr.simpleExpr(42, 119);
    _root_.org.scalatest.diagrams.DiagrammedExpr.applyExpr($org_scalatest_macro_qualifier, scala.collection.immutable.List.apply($org_scalatest_macro_arg_0), $org_scalatest_macro_qualifier.value.$eq$eq($org_scalatest_macro_arg_0.value), 116)
  };
  _root_.org.scalatest.diagrams.Diagrams.diagrammedAssertionsHelper.macroAssume($org_scalatest_assert_macro_expr, "this is a clue", "        org.scalatest.diagrams.Diagrams.assume(Await.result(Future { count = count + 1; 42 }, Duration(1, SECONDS)) == 42, \"this is a clue\")", (Position.apply("DirectDiagrammedAssertionsSpec.scala", "Please set the environment variable SCALACTIC_FILL_FILE_PATHNAMES to yes at compile time to enable this feature.", 9999): org.scalactic.source.Position))

@cheeseng cheeseng merged commit 9fffb01 into scalatest:3.2.x-new Jan 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bvenners bvenners bvenners approved these changes

Assignees
No one assigned
Labels
cla-signed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@cheeseng @bvenners