From 5d9d803f854267cfc021cbdfc30878bc1876caeb Mon Sep 17 00:00:00 2001 From: "Rustam.Vishnyakov" Date: Wed, 10 Nov 2010 13:27:08 +0300 Subject: [PATCH] Correctly update a list of available JS libraries in usage scope settings --- .../ide/scriptingContext/LangScriptingContextConfigurable.java | 2 +- .../intellij/ide/scriptingContext/ScriptingLibraryMappings.java | 1 + .../roots/libraries/scripting/ScriptingLibraryManager.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/scriptingContext/LangScriptingContextConfigurable.java b/platform/lang-impl/src/com/intellij/ide/scriptingContext/LangScriptingContextConfigurable.java index 84b243c7e81e..82158e23cf03 100644 --- a/platform/lang-impl/src/com/intellij/ide/scriptingContext/LangScriptingContextConfigurable.java +++ b/platform/lang-impl/src/com/intellij/ide/scriptingContext/LangScriptingContextConfigurable.java @@ -76,7 +76,7 @@ public abstract class LangScriptingContextConfigurable implements Configurable, @Override public void reset() { - myLibManager.dropChanges(); + myLibManager.reset(); myPanel.resetTable(); } diff --git a/platform/lang-impl/src/com/intellij/ide/scriptingContext/ScriptingLibraryMappings.java b/platform/lang-impl/src/com/intellij/ide/scriptingContext/ScriptingLibraryMappings.java index 777172e6141d..2f9bebde96ec 100644 --- a/platform/lang-impl/src/com/intellij/ide/scriptingContext/ScriptingLibraryMappings.java +++ b/platform/lang-impl/src/com/intellij/ide/scriptingContext/ScriptingLibraryMappings.java @@ -75,6 +75,7 @@ public class ScriptingLibraryMappings extends LanguagePerFileMappings getAvailableValues(VirtualFile file) { + myLibraryManager.reset(); List libraries = getSingleLibraries(); if (myCompoundLibMap.containsKey(file)) { libraries.add(myCompoundLibMap.get(file)); diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingLibraryManager.java b/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingLibraryManager.java index 77cf1187dee0..921c06a29345 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingLibraryManager.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingLibraryManager.java @@ -110,7 +110,7 @@ public class ScriptingLibraryManager { } } - public void dropChanges() { + public void reset() { myLibTable = null; }