Fixed ISE when removing a resource from resource set

Signed-off-by: Sebastian Zarnekow <sebastian.zarnekow@gmail.com>
eclipse · Apr 22, 2024 · 995655f · 995655f
1 parent 3a9f915
commit 995655f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/DetachNodeModelTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/DetachNodeModelTest.java
@@ -11,6 +11,7 @@
 import java.io.IOException;
 import java.util.Iterator;
 
+import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.enumrules.enumAndReferenceTestLanguage.EntityWithEnumAndReference;
 import org.eclipse.xtext.enumrules.enumAndReferenceTestLanguage.EnumAndReferenceTestLanguagePackage;
@@ -72,6 +73,13 @@ public void setUp() throws Exception {
 		assertTrue(resource.getErrors().isEmpty());
 	}
 
+	@Test public void testNoExceptionWhenRemovedFromResourceSet() throws Exception {
+		String modelAsString = "kindOfKeyword Hoo reference Hoo";
+		XtextResource resource = parse(modelAsString);
+		ResourceSet rs = resource.getResourceSet();
+		rs.getResources().remove(resource);
+	}
+
 	protected void assertEqualNodes(RootNode expected, RootNode actual) throws IOException {
 		Iterator<INode> expectedIter = expected.getAsTreeIterable().iterator();
 		Iterator<INode> actualIter = actual.getAsTreeIterable().iterator();

diff --git a/...lipse.xtext/src/org/eclipse/xtext/nodemodel/detachable/AbstractDetachableParseResult.java b/...lipse.xtext/src/org/eclipse/xtext/nodemodel/detachable/AbstractDetachableParseResult.java
@@ -81,7 +81,7 @@ protected void discard() {
 		if (logger.isTraceEnabled()) {
 			logger.trace("DetachableParseResultBase.discard");
 		}
-		timer.stop();
+		timer.reset();
 	}
 
 	protected void nodeModelRequested() {