From 531f53cf55f17fce1972e37c0abc62d86997f867 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Fri, 17 Jul 2015 16:26:44 +0300
Subject: [PATCH] correct version number

---
 .../src/com/intellij/util/xml/DomFileIndex.java      |  2 +-
 .../util/xml/impl/DomApplicationComponent.java       | 12 +++++++++---
 .../util/xml/stubs/builder/DomStubBuilder.java       |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/xml/dom-impl/src/com/intellij/util/xml/DomFileIndex.java b/xml/dom-impl/src/com/intellij/util/xml/DomFileIndex.java
index b5090dce0e31..75c67ff21c72 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/DomFileIndex.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/DomFileIndex.java
@@ -103,6 +103,6 @@ public class DomFileIndex extends ScalarIndexExtension<String>{
 
   @Override
   public int getVersion() {
-    return DomApplicationComponent.getInstance().getCumulativeVersion();
+    return DomApplicationComponent.getInstance().getCumulativeVersion(false);
   }
 }
diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java
index d125b7589752..43869bad766e 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java
@@ -105,11 +105,17 @@ public class DomApplicationComponent {
     return ServiceManager.getService(DomApplicationComponent.class);
   }
 
-  public int getCumulativeVersion() {
+  public int getCumulativeVersion(boolean forStubs) {
     int result = 0;
     for (DomFileDescription description : getAllFileDescriptions()) {
-      if (description.hasStubs()) {
-        result += description.getStubVersion();
+      if (forStubs) {
+        if (description.hasStubs()) {
+          result += description.getStubVersion();
+          result += description.getRootTagName().hashCode(); // so that a plugin enabling/disabling could trigger the reindexing
+        }
+      }
+      else {
+        result += description.getVersion();
         result += description.getRootTagName().hashCode(); // so that a plugin enabling/disabling could trigger the reindexing
       }
     }
diff --git a/xml/dom-impl/src/com/intellij/util/xml/stubs/builder/DomStubBuilder.java b/xml/dom-impl/src/com/intellij/util/xml/stubs/builder/DomStubBuilder.java
index 3bb4382a0a23..bf9ae16de8b5 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/stubs/builder/DomStubBuilder.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/stubs/builder/DomStubBuilder.java
@@ -92,6 +92,6 @@ public class DomStubBuilder implements BinaryFileStubBuilder {
 
   @Override
   public int getStubVersion() {
-    return 21 + DomApplicationComponent.getInstance().getCumulativeVersion();
+    return 21 + DomApplicationComponent.getInstance().getCumulativeVersion(true);
   }
 }