MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-01 06:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

Tests

Browse Source
This commit is contained in:
Eugene Vigdorchik
2005-03-24 20:50:48 +03:00
parent 4d05597d4d
commit 1bb3ff8c00
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openapi/src/com/intellij/psi/PsiImportList.java
+1
View File
@@ -14,4 +14,5 @@ public interface PsiImportList extends PsiElement {
PsiImportStatement findSingleClassImportStatement(String qName);
PsiImportStatement findOnDemandImportStatement(String packageName);
PsiImportStatementBase findSingleImportStatement(String name);
boolean isReplaceEquivalent(PsiImportList otherList);
}
source/com/intellij/codeInsight/actions/OptimizeImportsProcessor.java
+1 -4
View File
@@ -44,10 +44,7 @@ public class OptimizeImportsProcessor extends AbstractLayoutCodeProcessor {
public void run() {
try {
if (newImportList != null) {
PsiImportList oldImportList = ((PsiJavaFile)file).getImportList();
if (!oldImportList.getText().equals(newImportList.getText())) {
oldImportList.replace(newImportList);
}
((PsiJavaFile)file).getImportList().replace(newImportList);
}
}
catch (IncorrectOperationException e) {
source/com/intellij/psi/impl/source/PsiImportListImpl.java
+4
View File
@@ -182,6 +182,10 @@ public class PsiImportListImpl extends SlaveRepositoryPsiElement implements PsiI
return (PsiImportStatementBase)myNameToSingleImportMap.get(name);
}
public boolean isReplaceEquivalent(PsiImportList otherList) {
return getText().equals(otherList.getText());
}
private void initializeMaps() {
if (myClassNameToImportMap == null) {
myClassNameToImportMap = new HashMap();
source/com/intellij/psi/impl/source/codeStyle/ImportHelper.java
+1 -1
View File
@@ -115,7 +115,7 @@ public class ImportHelper{
PsiImportList resultList = dummyFile.getImportList();
PsiImportList oldList = file.getImportList();
if (resultList.getText().equals(oldList.getText())) return null;
if (oldList.isReplaceEquivalent(resultList)) return null;
return resultList;
}
catch(IncorrectOperationException e) {