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

resource bundle editor copy search whole project content for target RB-s IDEA-159110

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-08-09 19:28:47 +03:00
parent 403a35395e
commit 7573beb486
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/BundleNameEvaluator.java
+7
View File
@@ -43,6 +43,13 @@ public interface BundleNameEvaluator {
}
};
BundleNameEvaluator BASE_NAME = new BundleNameEvaluator() {
@Nullable
public String evaluateBundleName(final PsiFile psiFile) {
return ResourceBundleManager.getInstance(psiFile.getProject()).getBaseName(psiFile);
}
};
@Nullable
String evaluateBundleName(PsiFile psiFile);
}
plugins/properties/src/com/intellij/lang/properties/editor/PropertiesCopyHandler.java
+3 -3
View File
@@ -42,7 +42,7 @@ import com.intellij.psi.PsiFileSystemItem;
import com.intellij.psi.PsiManager;
import com.intellij.psi.impl.SyntheticFileSystemItem;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.GlobalSearchScopesCore;
import com.intellij.psi.search.ProjectScope;
import com.intellij.psi.search.PsiElementProcessor;
import com.intellij.refactoring.copy.CopyHandlerDelegateBase;
import com.intellij.ui.ComboboxSpeedSearch;
@@ -238,7 +238,7 @@ public class PropertiesCopyHandler extends CopyHandlerDelegateBase {
final Collection<PropertiesFile> propertiesFiles = new ArrayList<>();
GlobalSearchScope searchScope = GlobalSearchScopesCore.projectProductionScope(myProject).union(GlobalSearchScopesCore.projectTestScope(myProject));
GlobalSearchScope searchScope = ProjectScope.getContentScope(myProject);
PropertiesReferenceManager
.getInstance(myProject)
.processPropertiesFiles(searchScope,
@@ -248,7 +248,7 @@ public class PropertiesCopyHandler extends CopyHandlerDelegateBase {
propertiesFiles.add(propertiesFile);
return true;
}
}, BundleNameEvaluator.DEFAULT);
}, BundleNameEvaluator.BASE_NAME);
final List<PsiFileSystemItem> resourceBundlesAsFileSystemItems = propertiesFiles
.stream()