MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Correctly updating a list of JS libraries in library usage scope after library removal

Browse Source
This commit is contained in:
Rustam.Vishnyakov
2011-02-01 15:33:39 +03:00
parent 9a60bbb6c8
commit bc2bf913f8
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/scriptingContext/LangScriptingContextConfigurable.java
+1 -1
View File
@@ -64,7 +64,7 @@ public abstract class LangScriptingContextConfigurable implements Configurable,
public void run() {
myLibManager.commitChanges();
myPanel.resetTable();
myContextsConfigurable.resetMappings();
myContextsConfigurable.reset();
}
});
}
platform/lang-impl/src/com/intellij/ide/scriptingContext/ScriptingLibraryMappings.java
+13 -7
View File
@@ -76,19 +76,24 @@ public class ScriptingLibraryMappings extends LanguagePerFileMappings<ScriptingL
private void updateMappings() {
myLibraryManager.reset();
Map<VirtualFile,ScriptingLibraryTable.LibraryModel> map = getMappings();
for (ScriptingLibraryTable.LibraryModel value : map.values()) {
for (VirtualFile file : map.keySet()) {
ScriptingLibraryTable.LibraryModel value = getImmediateMapping(file);
if (value instanceof CompoundLibrary) {
CompoundLibrary container = (CompoundLibrary) value;
ScriptingLibraryTable.LibraryModel[] libModels =
container.getLibraries().toArray(new ScriptingLibraryTable.LibraryModel[container.getLibraryCount()]);
container.getLibraries().toArray(new ScriptingLibraryTable.LibraryModel[container.getLibraryCount()]);
CompoundLibrary newContainer = new CompoundLibrary();
for (ScriptingLibraryTable.LibraryModel libraryModel : libModels) {
String libName = libraryModel.getName();
if (myLibraryManager.getLibraryByName(libName) == null) {
container.removeLibrary(libName);
String libName = libraryModel.getName();
if (myLibraryManager.getLibraryByName(libName) != null) {
newContainer.addLibrary(libraryModel);
}
}
newContainer.applyChanges();
setMapping(file, newContainer.isEmpty() ? null : newContainer);
}
}
}
@Override
@@ -313,8 +318,9 @@ public class ScriptingLibraryMappings extends LanguagePerFileMappings<ScriptingL
myLibraries.put(libName, library);
}
private void removeLibrary(@NotNull String libName) {
myLibraries.remove(libName);
private void addLibrary(@NotNull ScriptingLibraryTable.LibraryModel library) {
final String libName = library.getName();
myLibraries.put(libName, library);
}
public boolean containsLibrary(String libName) {