sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 08:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1721 from eclipse/cd_xtext_issue1697neu

Browse source 
clear caches on updateInternalState
This commit is contained in:
Christian Dietrich 2021-08-09 11:01:31 +02:00 committed by GitHub
commit 7ee2b584b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourceTest.java
View file

@ -141,4 +141,12 @@ public class XtextResourceTest extends AbstractXtextTests {
assertEquals(1, diag.getLength());
}
@Test public void testClearCache() throws Exception {
resource.update(0, 0, simpleModel);
Object cv1 = resource.getCache().get("justatest", resource, ()->new Object());
resource.update(0, 0, "");
Object cv2 = resource.getCache().get("justatest", resource, ()->new Object());
assertNotSame(cv1, cv2);
}
}

14
org.eclipse.xtext.util/src/org/eclipse/xtext/util/OnChangeEvictingCache.java
View file

@ -55,7 +55,10 @@ public class OnChangeEvictingCache implements IResourceScopeCache {
*/
@Override
public void clear(Resource resource) {
getOrCreate(resource).clearValues();
CacheAdapter cacheAdapter = findCacheAdapter(resource);
if (cacheAdapter != null) {
cacheAdapter.clearValues();
}
}
/**
@ -108,7 +111,7 @@ public class OnChangeEvictingCache implements IResourceScopeCache {
* @return the cache adapter for the given resource. Never <code>null</code>.
*/
public CacheAdapter getOrCreate(Resource resource) {
CacheAdapter adapter = (CacheAdapter) EcoreUtil.getAdapter(resource.eAdapters(), CacheAdapter.class);
CacheAdapter adapter = findCacheAdapter(resource);
if (adapter == null) {
adapter = createCacheAdapter();
resource.eAdapters().add(adapter);
@ -117,6 +120,13 @@ public class OnChangeEvictingCache implements IResourceScopeCache {
return adapter;
}
/**
* @since 2.26
*/
protected CacheAdapter findCacheAdapter(Resource resource) {
return (CacheAdapter) EcoreUtil.getAdapter(resource.eAdapters(), CacheAdapter.class);
}
/**
* @since 2.23
*/

14
org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResource.java
View file

@ -43,6 +43,7 @@ import org.eclipse.xtext.serializer.ISerializer;
import org.eclipse.xtext.service.OperationCanceledManager;
import org.eclipse.xtext.util.IResourceScopeCache;
import org.eclipse.xtext.util.LazyStringInputStream;
import org.eclipse.xtext.util.OnChangeEvictingCache;
import org.eclipse.xtext.util.ReplaceRegion;
import org.eclipse.xtext.util.TextRegion;
import org.eclipse.xtext.validation.IConcreteSyntaxValidator;
@ -297,6 +298,7 @@ public class XtextResource extends ResourceImpl {
if (newRootASTElement != null && !containsRootElement(newRootASTElement))
getContents().add(0, newRootASTElement);
reattachModificationTracker(newRootASTElement);
clearCache();
clearErrorsAndWarnings();
addSyntaxErrors();
doLinking();
@ -308,7 +310,17 @@ public class XtextResource extends ResourceImpl {
boolean containsRootElement(EObject newRootASTElement) {
return getContents().contains(newRootASTElement);
}
/**
* @since 2.26
*/
protected void clearCache() {
IResourceScopeCache cache = getCache();
if (cache instanceof OnChangeEvictingCache) {
cache.clear(this);
}
}
protected void clearErrorsAndWarnings() {
getWarnings().clear();
getErrors().clear();