From 7d20ed193b5fc3dad714c3e4241f3bddee1f5978 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Wed, 4 Sep 2013 15:50:15 +0400 Subject: [PATCH] IDEA-112870 Changing a library's scope from compile to testCompile in build.gradle does not change IDEA module settings --- .../project/manage/LibraryDependencyDataService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDependencyDataService.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDependencyDataService.java index b24cb1cdd1be..80d832fcfd11 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDependencyDataService.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDependencyDataService.java @@ -220,9 +220,10 @@ public class LibraryDependencyDataService extends AbstractDependencyDataService< } } else if (entry instanceof LibraryOrderEntry) { - String libraryName = ((LibraryOrderEntry)entry).getLibraryName(); - LibraryDependencyData existing = projectLibrariesToImport.remove(libraryName); - if (existing != null) { + final LibraryOrderEntry libraryOrderEntry = (LibraryOrderEntry)entry; + final String libraryName = libraryOrderEntry.getLibraryName(); + final LibraryDependencyData existing = projectLibrariesToImport.remove(libraryName); + if (existing != null && libraryOrderEntry.getScope() == existing.getScope()) { toImport.remove(existing); } else if (!hasUnresolvedLibraries) {