Merge pull request #840 from savetheclocktower/fix-scope-resolver-fix

Fix behavior of new `ScopeResolver` config caching in specs

Author: savetheclocktower

spec/scope-resolver-spec.js

@@ -104,6 +104,10 @@ describe('ScopeResolver', () => {
     atom.config.set('core.useExperimentalModernTreeSitter', true);
   });
 
+  afterEach(() => {
+    ScopeResolver.clearConfigCache();
+  });
+
   it('resolves all scopes in absence of any tests or adjustments', async () => {
     await grammar.setQueryForTest('highlightsQuery', `
       (comment) @comment

src/scope-resolver.js

@@ -124,6 +124,10 @@ ConfigCache.forConfig = (config) => {
   return configCache;
 };
 
+ConfigCache.clear = () => {
+  ConfigCache.CACHES_FOR_CONFIG_OBJECTS.clear();
+};
+
 
 // A data structure for storing scope information while processing capture
 // data. The data is reset in between each task.
@@ -954,5 +958,9 @@ ScopeResolver.ADJUSTMENTS = {
   }
 };
 
+ScopeResolver.clearConfigCache = () => {
+  ConfigCache.clear();
+};
+
 
 module.exports = ScopeResolver;