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

maven: detect changes for non-xml polyglot pom files

Browse Source
This commit is contained in:
Vladislav.Soroka
2016-09-20 14:39:49 +03:00
parent 26450f8007
commit 9d8cd9029a
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java
+24 -16
View File
@@ -42,6 +42,9 @@ import com.intellij.openapi.vfs.pointers.VirtualFilePointer;
import com.intellij.openapi.vfs.pointers.VirtualFilePointerListener;
import com.intellij.openapi.vfs.pointers.VirtualFilePointerManager;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import com.intellij.psi.xml.XmlFile;
import com.intellij.util.PathUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.messages.MessageBusConnection;
@@ -64,7 +67,7 @@ import java.util.concurrent.ConcurrentMap;
public class MavenProjectsManagerWatcher {
private static final Key<ConcurrentMap<Project, Integer>> CRC_WITHOUT_SPACES = Key.create("MavenProjectsManagerWatcher.CRC_WITHOUT_SPACES");
private static final Key<ConcurrentMap<Project, Long>> CRC_WITHOUT_SPACES = Key.create("MavenProjectsManagerWatcher.CRC_WITHOUT_SPACES");
public static final Key<Boolean> FORCE_IMPORT_AND_RESOLVE_ON_REFRESH =
Key.create(MavenProjectsManagerWatcher.class + "FORCE_IMPORT_AND_RESOLVE_ON_REFRESH");
@@ -404,7 +407,7 @@ public class MavenProjectsManagerWatcher {
VirtualFile pom = getPomFileProfilesFile(file);
if (pom != null) {
if (remove || xmlFileWasChanged(pom, event)) {
if (remove || fileWasChanged(pom, event)) {
filesToUpdate.add(pom);
}
return;
@@ -414,32 +417,37 @@ public class MavenProjectsManagerWatcher {
filesToRemove.add(file);
}
else {
if (xmlFileWasChanged(file, event)) {
if (fileWasChanged(file, event)) {
filesToUpdate.add(file);
}
}
}
private boolean xmlFileWasChanged(VirtualFile xmlFile, VFileEvent event) {
if (!xmlFile.isValid() || !(event instanceof VFileContentChangeEvent)) return true;
private boolean fileWasChanged(VirtualFile file, VFileEvent event) {
if (!file.isValid() || !(event instanceof VFileContentChangeEvent)) return true;
ConcurrentMap<Project, Integer> map = xmlFile.getUserData(CRC_WITHOUT_SPACES);
ConcurrentMap<Project, Long> map = file.getUserData(CRC_WITHOUT_SPACES);
if (map == null) {
ConcurrentMap<Project, Integer> value = ContainerUtil.createConcurrentWeakMap();
map = xmlFile.putUserDataIfAbsent(CRC_WITHOUT_SPACES, value);
ConcurrentMap<Project, Long> value = ContainerUtil.createConcurrentWeakMap();
map = file.putUserDataIfAbsent(CRC_WITHOUT_SPACES, value);
}
Integer crc = map.get(myProject);
Integer newCrc;
Long crc = map.get(myProject);
Long newCrc;
try {
newCrc = MavenUtil.crcWithoutSpaces(xmlFile);
}
catch (IOException ignored) {
return true;
PsiFile psiFile = PsiManager.getInstance(myProject).findFile(file);
if(psiFile instanceof XmlFile) {
try {
newCrc = Long.valueOf(MavenUtil.crcWithoutSpaces(file));
}
catch (IOException ignored) {
return true;
}
} else {
newCrc = file.getModificationStamp();
}
if (newCrc == -1 // XML is invalid
if (newCrc == -1 // file is invalid
|| newCrc.equals(crc)) {
return false;
}