Use own Parser in UpdateUnitVersions

[trancexpress]

Fixes: #666

[trancexpress]

Lets see if this is enough. See my comment here: #666 (comment)

With the UI event processing and editor closing, the test doesn't fail after so many repetitions and it doesn't get slower. I don't know if the fails are a byproduct of repeating the test though... Since repeating it results in tons of editors getting opened (and maybe some code in Eclipse starts closing them when there are too many, maybe also saving them).

Maybe the problem is elsewhere. I wasn't able to run into a race condition though, while debugging.

[eclipse-pde-bot]

This pull request changes some projects for the first time in this development cycle.
Therefore the following files need a version increment:

ui/org.eclipse.pde.genericeditor.extension.tests/META-INF/MANIFEST.MF
ui/org.eclipse.pde.genericeditor.extension.tests/pom.xml
ui/org.eclipse.pde.genericeditor.extension/META-INF/MANIFEST.MF

An additional commit containing all the necessary changes was pushed to the top of this PR's branch. To obtain these changes (for example if you want to push more changes) either fetch from your fork or apply the git patch.

Git patch

From e106163ae5f3fbc8995508a4469cc8d0e666e327 Mon Sep 17 00:00:00 2001
From: Eclipse PDE Bot <pde-bot@eclipse.org>
Date: Tue, 18 Nov 2025 08:56:20 +0000
Subject: [PATCH] Version bump(s) for 4.38 stream


diff --git a/ui/org.eclipse.pde.genericeditor.extension.tests/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.genericeditor.extension.tests/META-INF/MANIFEST.MF
index 105df5f988..035112ee37 100644
--- a/ui/org.eclipse.pde.genericeditor.extension.tests/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.pde.genericeditor.extension.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for Generic Target Platform Editor
 Bundle-SymbolicName: org.eclipse.pde.genericeditor.extension.tests
-Bundle-Version: 1.3.100.qualifier
+Bundle-Version: 1.3.200.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
diff --git a/ui/org.eclipse.pde.genericeditor.extension.tests/pom.xml b/ui/org.eclipse.pde.genericeditor.extension.tests/pom.xml
index 2f8d41039c..f680559b39 100644
--- a/ui/org.eclipse.pde.genericeditor.extension.tests/pom.xml
+++ b/ui/org.eclipse.pde.genericeditor.extension.tests/pom.xml
@@ -18,7 +18,7 @@
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>org.eclipse.pde.genericeditor.extension.tests</artifactId>
-  <version>1.3.100-SNAPSHOT</version>
+  <version>1.3.200-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <properties>
diff --git a/ui/org.eclipse.pde.genericeditor.extension/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.genericeditor.extension/META-INF/MANIFEST.MF
index cb86c60b2d..443137c0e8 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.pde.genericeditor.extension/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.pde.genericeditor.extension;singleton:=true
-Bundle-Version: 1.3.200.qualifier
+Bundle-Version: 1.3.300.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jface.text,
-- 
2.51.2

Further information are available in Common Build Issues - Missing version increments.

[trancexpress]

No, it still fails:

 Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.559 s <<< FAILURE! -- in org.eclipse.pde.genericeditor.extension.tests.UpdateUnitVersionsCommandTests
org.eclipse.pde.genericeditor.extension.tests.UpdateUnitVersionsCommandTests.testUpdateRequired -- Time elapsed: 0.438 s
org.eclipse.pde.genericeditor.extension.tests.UpdateUnitVersionsCommandTests.testVersionSort -- Time elapsed: 0.120 s <<< FAILURE!
java.lang.AssertionError
	at org.junit.Assert.fail(Assert.java:87)
	at org.junit.Assert.assertTrue(Assert.java:42)
	at org.junit.Assert.assertNotNull(Assert.java:713)
	at org.junit.Assert.assertNotNull(Assert.java:723)
	at org.eclipse.pde.genericeditor.extension.tests.UpdateUnitVersionsCommandTests.confirmVersionUpdates(UpdateUnitVersionsCommandTests.java:84)
	at org.eclipse.pde.genericeditor.extension.tests.UpdateUnitVersionsCommandTests.testVersionSort(UpdateUnitVersionsCommandTests.java:55)

The other build failed with: #1903

[github-actions]

Test Results

   771 files  ±0     771 suites  ±0   54m 42s ⏱️ - 3m 18s
 3 648 tests ±0   3 590 ✅  - 2   54 💤 ±0  4 ❌ +2 
10 878 runs  ±0  10 711 ✅  - 2  163 💤 ±0  4 ❌ +2 

For more details on these failures, see this check.

Results for commit 8f5b93f. ± Comparison against base commit 85b502b.

♻️ This comment has been updated with latest results.

[trancexpress]

@laeubi sorry to take more of your time, but how can I run tests in a specific test plug-in, while using changes in a production plug-in?

E.g. I want to add some extra System.out.println() statements to org.eclipse.pde.genericeditor.extension and run all tests in org.eclipse.pde.genericeditor.extension.tests - this will save some time, since I'm not running all PDE tests.

If I cd to org.eclipse.pde.genericeditor.extension.tests and run mvn verify, only tests in org.eclipse.pde.genericeditor.extension.tests run, which is what I want. But the changes in org.eclipse.pde.genericeditor.extension are not used.

I've tried bumping the bundle version of org.eclipse.pde.genericeditor.extension and requiring the new version in org.eclipse.pde.genericeditor.extension.tests. But mvn can't seem to add the updated plug-in to the local repository I'm using:

Caused by: org.eclipse.tycho.p2.tools.director.shared.DirectorCommandException: Call to p2 director application failed:Cannot complete the install because of a conflicting dependency.: [Software being installed: Eclipse Plug-in Development Environment 3.16.500.v20251115-1814 (org.eclipse.pde.feature.group 3.16.500.v20251115-1814); Software currently installed: Eclipse Plug-in Development Environment 3.16.500.v20251115-1656 (org.eclipse.pde.feature.group 3.16.500.v20251115-1656); Only one of the following can be installed at once: : [PDE 3.13.3300.v20251115-1656 (org.eclipse.pde 3.13.3300.v20251115-1656); PDE 3.13.3300.v20251115-1814 (org.eclipse.pde 3.13.3300.v20251115-1814)]; Cannot satisfy dependency:: [From: Eclipse Plug-in Development Environment 3.16.500.v20251115-1656 (org.eclipse.pde.feature.group 3.16.500.v20251115-1656); To: org.eclipse.equinox.p2.iu; org.eclipse.pde [3.13.3300.v20251115-1656,3.13.3300.v20251115-1656]]; Cannot satisfy dependency:: [From: Eclipse Plug-in Development Environment 3.16.500.v20251115-1814 (org.eclipse.pde.feature.group 3.16.500.v20251115-1814); To: org.eclipse.equinox.p2.iu; org.eclipse.pde [3.13.3300.v20251115-1814,3.13.3300.v20251115-1814]]]. Program arguments were: [-metadataRepository, file:/data/git/eclipse/eclipse.pde/build/org.eclipse.pde.build.tests/target/,file:/data/git/eclipse/eclipse.pde/build/org.eclipse.pde.build.tests/target/targetPlatformRepository/,https://download.eclipse.org/eclipse/updates/4.38-I-builds/,file:/data/git/eclipse/eclipse.pde/build/org.eclipse.pde.build.tests/target/p2temp/additionalBundles/, -artifactRepository, file:/data/git/eclipse/eclipse.pde/build/org.eclipse.pde.build.tests/target/,file:/resolution-context-artifacts@%252Fdata%252Fgit%252Feclipse%252Feclipse.pde%252Fbuild%252Forg.eclipse.pde.build.tests,file:/data/git/eclipse/eclipse.pde/apitools/org.eclipse.pde.api.tools/target/,file:/data/git/eclipse/eclipse.pde/ui/org.eclipse.pde.core/target/,file:/data/git/eclipse/eclipse.pde/apitools/org.eclipse.pde.api.tools/target/,file:/data/git/eclipse/eclipse.pde/apitools/org.eclipse.pde.api.tools.annotations/target/,file:/data/git/eclipse/eclipse.pde/apitools/org.eclipse.pde.api.tools.annotations/target/,file:/data/git/eclipse/eclipse.pde/apitools/org.eclipse.pde.api.tools.ui/target/,file:/data/git/eclipse/eclipse.pde/ui/org.eclipse.pde.ui/target/,file:/data/git/eclipse/eclipse.pde/apitools/org.eclipse.pde.api.tools.ui/target/,file:/data/git/eclipse/eclipse.pde/ui/org.eclipse.pde.bnd.ui/target/,file:/data/git/eclipse/eclipse.pde/ui/org.eclipse.pde.bnd.ui/target/,file:/data/git/eclipse/eclipse.pde/build/org.eclipse.pde.build/target/,file:/data/git/eclipse/eclipse.pde/build/org.eclipse.pde.build/target/,file:/data/git/eclipse/eclipse.pde/build/org.eclipse.pde.build.tests/target/,file:/data/git/eclipse/eclipse.pde/build/org.eclipse.pde.build.tests/target/,file:/data/git/eclipse/eclipse.pde/ui/org.eclipse.pde.core/target/,file:/data/git/eclipse/eclipse.pde/org.eclipse.pde.doc.user/target/,file:/data/git/eclipse/eclipse.pde/ds/org.eclipse.pde.ds.annotations/target/,file:/data/git/eclipse/eclipse.pde/ds/org.eclipse.pde.ds.core/target/,file:/data/git/eclipse/eclipse.pde/ds/org.eclipse.pde.ds.annotations/target/,file:/data/git/eclipse/eclipse.pde/ds/org.eclipse.pde.ds.core/target/,file:/data/git/eclipse/eclipse.pde/ds/org.eclipse.pde.ds.ui/target/,file:/data/git/eclipse/eclipse.pde/ds/org.eclipse.pde.ds.ui/target/,file:/data/git/eclipse/eclipse.pde/ui/org.eclipse.pde/target/,file:/data/git/eclipse/eclipse.pde/ui/org.eclipse.pde.junit.runtime/target/,file:/data/git/eclipse/eclipse.pde/ui/org.eclipse.pde.runtime/target/,file:/data/git/eclipse/eclipse.pde/ui/org.eclipse.pde.ui.templates/target/,file:/data/git/eclipse/eclipse.pde/ui/org.eclipse.pde.launching/target/,file:/data/git/eclipse/eclipse.pde/ua/org.eclipse.pde.ua.core/target/,file:/data/git/eclipse/eclipse.pde/ua/org.eclipse.pde.ua.ui/target/,file:/data/git/eclipse/eclipse.pde/ui/org.eclipse.ui.trace/target/,file:/data/git/eclipse/eclipse.pde/ui/org.eclipse.pde.genericeditor.extension/target/,file:/data/git/eclipse/eclipse.pde/features/org.eclipse.pde-feature/target/,file:/data/git/eclipse/eclipse.pde/ui/org.eclipse.pde.genericeditor.extension/target/,file:/data/git/eclipse/eclipse.pde/ui/org.eclipse.pde.junit.runtime/target/,file:/data/git/eclipse/eclipse.pde/ui/org.eclipse.pde.launching/target/,file:/data/git/eclipse/eclipse.pde/ui/org.eclipse.pde.runtime/target/,file:/data/git/eclipse/eclipse.pde/ua/org.eclipse.pde.ua.core/target/,file:/data/git/eclipse/eclipse.pde/ua/org.eclipse.pde.ua.ui/target/,file:/data/git/eclipse/eclipse.pde/ui/org.eclipse.pde.ui/target/,file:/data/git/eclipse/eclipse.pde/ui/org.eclipse.pde.ui.templates/target/,file:/data/git/eclipse/eclipse.pde/ui/org.eclipse.ui.trace/target/,file:/tmp/test/.m2/repository/,https://download.eclipse.org/eclipse/updates/4.38-I-builds/,file:/data/git/eclipse/eclipse.pde/build/org.eclipse.pde.build.tests/target/p2temp/additionalBundles/, -installIU, org.eclipse.pde.build.tests,org.eclipse.tycho.surefire.osgibooter,org.eclipse.tycho.surefire.junit4,org.eclipse.pde.feature.group,org.eclipse.platform.ide,org.eclipse.tips.feature.feature.group,org.eclipse.test.feature.group,org.eclipse.osgi.source,org.eclipse.team.core.source, -destination, /data/git/eclipse/eclipse.pde/build/org.eclipse.pde.build.tests/target/sdk-product/pde, -profile, SDKProfile, -profileProperties, org.eclipse.update.install.features=true, -roaming, -p2.os, linux, -p2.ws, gtk, -p2.arch, x86_64].

So when I run mvn in the test plug-in, it doesn't find the new version of the production plug-in.

Are there maybe some arguments I can pass to mvn, to run only specific tests, when running mvn from the PDE repository root? If not, what else can I do?

[laeubi]

If I cd to org.eclipse.pde.genericeditor.extension.tests and run mvn verify, only tests in org.eclipse.pde.genericeditor.extension.tests run, which is what I want. But the changes in org.eclipse.pde.genericeditor.extension are not used.

you can go to the git root then run

mvn clean verify -pl :org.eclipse.pde.genericeditor.extension.tests,:org.eclipse.pde.genericeditor.extension

see https://books.sonatype.com/mvnref-book/reference/_using_advanced_reactor_options.html

[trancexpress]

Following this comment from @jukzi : #666 (comment)

Running the test with this change:

diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/UnitNode.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/ex
tension/model/UnitNode.java
index 7098c434fe..bb67847220 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/UnitNode.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/UnitNode.java
@@ -39,6 +39,10 @@ public class UnitNode extends Node {
        }
 
        public void setVersion(String version) {
+               try {
+                       Thread.sleep(1_000);
+               } catch (InterruptedException e) {
+               }
                this.version = version;
        }

Results in a dialog shown during the test:

Clicking OK on the dialog results in a test fail:

org.junit.ComparisonFailure: ID: org.eclipse.fake.1 has the incorrect version. updatedText=<target>
<locations>
<location>
<unit id="org.eclipse.fake.1" version="0.0.0"/>
<unit id="org.eclipse.fake.2" version="0.0.0"/>
<unit id="org.eclipse.fake.3" version="0.0.0"/>
<unit id="org.eclipse.fake.4" version="0.0.0"/>
<unit id="org.eclipse.fake.5" version="0.0.0"/>
<unit id="org.eclipse.fake.6" version="0.0.0"/>
<unit id="org.eclipse.fake.7" version="0.0.0"/>
<repository location="bundleentry://175.fwk544699696/testing-files/testing-sites/MultipleUnitsConfirmSorting/"/>
</location>
</locations>
</target> expected:<[2].0.0> but was:<[0].0.0>
	at org.junit.Assert.assertEquals(Assert.java:117)
	at org.eclipse.pde.genericeditor.extension.tests.UpdateUnitVersionsCommandTests.confirmVersionUpdates(UpdateUnitVersionsCommandTests.java:94)
	at org.eclipse.pde.genericeditor.extension.tests.UpdateUnitVersionsCommandTests.testVersionSort(UpdateUnitVersionsCommandTests.java:55)
	...

Due to the dialog I'm not sure the fail is the same as what we observe in #666... But this is another thing to try to fix.

Other code (not the tested command) calling UnitNode.set() during the test:

	at org.eclipse.pde.internal.genericeditor.target.extension.model.UnitNode.setVersion(UnitNode.java:51)
	at org.eclipse.pde.internal.genericeditor.target.extension.model.xml.Parser.parse(Parser.java:74)
	at org.eclipse.pde.internal.genericeditor.target.extension.codemining.TargetDefinitionCodeMiningProvider.fillCodeMinings(TargetDefinitionCodeMiningProvider.java:52)
	at org.eclipse.pde.internal.genericeditor.target.extension.codemining.TargetDefinitionCodeMiningProvider.lambda$0(TargetDefinitionCodeMiningProvider.java:40)
	at java.base/java.util.concurrent.CompletableFuture$AsyncSupply.run(CompletableFuture.java:1768)
	at java.base/java.util.concurrent.CompletableFuture$AsyncSupply.exec(CompletableFuture.java:1760)
	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:387)
	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1312)
	at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1843)
	at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1808)
	at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:188)

	at org.eclipse.pde.internal.genericeditor.target.extension.model.UnitNode.setVersion(UnitNode.java:51)
	at org.eclipse.pde.internal.genericeditor.target.extension.model.xml.Parser.parse(Parser.java:74)
	at org.eclipse.pde.internal.genericeditor.target.extension.validator.SyntaxValidatorListener.lambda$1(SyntaxValidatorListener.java:60)
	at java.base/java.util.concurrent.CompletableFuture$AsyncRun.run(CompletableFuture.java:1804)
	at java.base/java.util.concurrent.CompletableFuture$AsyncRun.exec(CompletableFuture.java:1796)
	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:387)
	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1312)
	at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1843)
	at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1808)
	at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:188)

If the problem is caused by one of those, I'm not sure how to wait on them. They are not jobs.

No dialog/fail if I remove TargetDefinitionCodeMiningProvider:

diff --git a/ui/org.eclipse.pde.genericeditor.extension/plugin.xml b/ui/org.eclipse.pde.genericeditor.extension/plugin.xml
index 6e65eb9a83..300b00b766 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/plugin.xml
+++ b/ui/org.eclipse.pde.genericeditor.extension/plugin.xml
@@ -9,7 +9,7 @@
      https://www.eclipse.org/legal/epl-2.0/
 
      SPDX-License-Identifier: EPL-2.0
-    
+
      Contributors:
          IBM Corporation - initial API and implementation
          Lars Vogel (vogella GmbH) - ongoing maintenance
@@ -145,7 +145,7 @@
           </themeid>
        </stylesheet>
     </extension>
-   <extension
+   <!--<extension
          point="org.eclipse.ui.workbench.texteditor.codeMiningProviders">
       <codeMiningProvider
             class="org.eclipse.pde.internal.genericeditor.target.extension.codemining.TargetDefinitionCodeMiningProvider"
@@ -161,7 +161,7 @@
             </with>
          </enabledWhen>
       </codeMiningProvider>
-   </extension>
+   </extension>-->
    <extension
          point="org.eclipse.core.expressions.propertyTesters">
       <propertyTester

Maybe the test can disable code minings and re-enable it after its done?...

In particular the command exits early due to this code:

			for (LocationNode locationNode : locationNodes) {
				System.out.println("locationNode: " + this);
				List<String> repositoryLocations = locationNode.getRepositoryLocations();
				if (repositoryLocations.isEmpty()) {
					System.out.println("repositoryLocations empty for: " + locationNode);
					continue;
				}

The code minings task seems to somehow work on the same node, which I don't understand:

repositoryLocations empty for: org.eclipse.pde.internal.genericeditor.target.extension.model.LocationNode@4102319a
addRepositoryLocation: org.eclipse.pde.internal.genericeditor.target.extension.model.LocationNode@4102319a
	at org.eclipse.pde.internal.genericeditor.target.extension.model.LocationNode.addRepositoryLocation(LocationNode.java:35)
	at org.eclipse.pde.internal.genericeditor.target.extension.model.xml.Parser.parse(Parser.java:81)
	at org.eclipse.pde.internal.genericeditor.target.extension.codemining.TargetDefinitionCodeMiningProvider.fillCodeMinings(TargetDefinitionCodeMiningProvider.java:52)
	at org.eclipse.pde.internal.genericeditor.target.extension.codemining.TargetDefinitionCodeMiningProvider.lambda$0(TargetDefinitionCodeMiningProvider.java:40)

[trancexpress]

Looks like calling Parser.getDefault().parse(document) in parallel and then calling parser.getRootNode() is a bad idea:

	public Node getRootNode() {
		return target;
	}

	public void parse(IDocument document) throws XMLStreamException {
		target = null;

Different callers can start working on the structure created by some other thread...

[trancexpress]

Fail on Linux is:

 Tests run: 8, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 1.151 s <<< FAILURE! -- in org.eclipse.pde.api.tools.builder.tests.usage.Java8LambdaUsageTests
org.eclipse.pde.api.tools.builder.tests.usage.Java8LambdaUsageTests.testLambdaExpressionF -- Time elapsed: 0.644 s <<< FAILURE!
junit.framework.AssertionFailedError: Should not be a JDT error: The import f cannot be resolved
	at junit.framework.Assert.fail(Assert.java:57)
	at junit.framework.Assert.assertTrue(Assert.java:22)
	at junit.framework.Assert.assertFalse(Assert.java:39)
	at junit.framework.TestCase.assertFalse(TestCase.java:208)
	at org.eclipse.pde.api.tools.builder.tests.ApiBuilderTest.expectingNoJDTProblemsFor(ApiBuilderTest.java:216)
	at org.eclipse.pde.api.tools.builder.tests.usage.Java8UsageTest.deployUsageTest(Java8UsageTest.java:112)
	at org.eclipse.pde.api.tools.builder.tests.usage.Java8LambdaUsageTests.x1(Java8LambdaUsageTests.java:84)
	at org.eclipse.pde.api.tools.builder.tests.usage.Java8LambdaUsageTests.testLambdaExpressionF(Java8LambdaUsageTests.java:67)

[trancexpress]

@iloveeclipse please review. I'm not sure this fixes all fails I've seen for the test, but it fixes some.

[iloveeclipse]

Two questions:

1. I assume this PR depends on Parser.getDefault() is thread-unsafe and is used in multiple threads #2135 discussion.
2. I see there JUnit 6 failures (probably unrelated to this PR), but are they known / addressed? See https://github.com/eclipse-pde/eclipse.pde/pull/2133/checks?check_run_id=55684752922

[trancexpress]

1. I assume this PR depends on [Parser.getDefault() is thread-unsafe and is used in multiple threads #2135](https://github.com/eclipse-pde/eclipse.pde/issues/2135) discussion.

Yes, we can wait for a general solution, if we decide on one.

2. I see there JUnit 6 failures (probably unrelated to this PR), but are they known / addressed? See https://github.com/eclipse-pde/eclipse.pde/pull/2133/checks?check_run_id=55684752922

Might be fixed by: #2129

Might not be. If so, #2128 stays open.

[trancexpress]

Lets see if #2139 gets accepted.

[trancexpress]

Closing in favor of #2139.