rewrite ImageInfoIndex as gist

GitOrigin-RevId: 180fb3991c7fc4de6a27dd855a1346a485d82002

diff --git a/images/resources/META-INF/plugin.xml b/images/resources/META-INF/plugin.xml
index b8ba3aab2047e0a68a4ca9e4bf63f972c4eaec13..26069b5032c797a57584afcf609cc8672fa90957 100644 (file)
--- a/images/resources/META-INF/plugin.xml
+++ b/images/resources/META-INF/plugin.xml
@@ -23,7 +23,6 @@
     <fileType name="Image" implementationClass="org.intellij.images.fileTypes.impl.ImageFileType" fieldName="INSTANCE" extensions="bigtiff;bmp;dcx;gif;icns;ico;jbig2;jpeg;jpg;pam;pbm;pcx;pgm;png;pnm;ppm;psd;rgbe;tga;tif;tiff;wbmp;xbm;xpm" />
     <fileType name="SVG" implementationClass="org.intellij.images.fileTypes.impl.SvgFileType" fieldName="INSTANCE" extensions="svg" language="SVG"/>
     <lang.parserDefinition language="SVG" implementationClass="org.intellij.images.fileTypes.impl.SvgParserDefinition"/>
-    <fileBasedIndex implementation="org.intellij.images.index.ImageInfoIndex"/>
     <fileLookupInfoProvider implementation="org.intellij.images.completion.ImageLookupInfoProvider"/>
     <documentationProvider implementation="org.intellij.images.fileTypes.ImageDocumentationProvider"/>
 

diff --git a/images/src/org/intellij/images/index/ImageInfoIndex.java b/images/src/org/intellij/images/index/ImageInfoIndex.java
index eef3e7f8a79833ee86fa1fb3bceee0fc2741973e..858771e91e7744080146ced05000902b35ea0617 100644 (file)
--- a/images/src/org/intellij/images/index/ImageInfoIndex.java
+++ b/images/src/org/intellij/images/index/ImageInfoIndex.java
@@ -1,11 +1,13 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.intellij.images.index;
 
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.containers.ContainerUtil;
-import com.intellij.util.indexing.*;
+import com.intellij.util.gist.GistManager;
+import com.intellij.util.gist.VirtualFileGist;
 import com.intellij.util.io.DataExternalizer;
 import com.intellij.util.io.DataInputOutputUtil;
 import org.intellij.images.fileTypes.ImageFileTypeManager;
@@ -19,12 +21,16 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-public final class ImageInfoIndex extends SingleEntryFileBasedIndexExtension<ImageInfo> {
-  private static final long ourMaxImageSize = (long)(Registry.get("ide.index.image.max.size").asDouble() * 1024 * 1024);
 
-  public static final ID<Integer, ImageInfo> INDEX_ID = ID.create("ImageFileInfoIndex");
+public class ImageInfoIndex {
+  @Nullable
+  public static ImageInfo getInfo(@NotNull VirtualFile file, @NotNull Project project) {
+    return ourGist.getFileData(project, file);
+  }
+
+  private static final long ourMaxImageSize = (long)(Registry.get("ide.index.image.max.size").asDouble() * 1024 * 1024);
 
-  private final DataExternalizer<ImageInfo> myValueExternalizer = new DataExternalizer<ImageInfo>() {
+  private static final DataExternalizer<ImageInfo> ourValueExternalizer = new DataExternalizer<ImageInfo>() {
     @Override
     public void save(@NotNull final DataOutput out, final ImageInfo info) throws IOException {
       DataInputOutputUtil.writeINT(out, info.width);
@@ -34,54 +40,32 @@ public final class ImageInfoIndex extends SingleEntryFileBasedIndexExtension<Ima
 
     @Override
     public ImageInfo read(@NotNull final DataInput in) throws IOException {
-      return new ImageInfo(DataInputOutputUtil.readINT(in), DataInputOutputUtil.readINT(in), DataInputOutputUtil.readINT(in));
+      return new ImageInfo(DataInputOutputUtil.readINT(in),
+                           DataInputOutputUtil.readINT(in),
+                           DataInputOutputUtil.readINT(in));
     }
   };
 
-  private final SingleEntryIndexer<ImageInfo> myDataIndexer = new SingleEntryIndexer<ImageInfo>(false) {
-    @Override
-    protected ImageInfo computeValue(@NotNull FileContent inputData) {
-      ImageInfoReader.Info info = ImageInfoReader.getInfo(inputData.getContent());
-      return info != null ? new ImageInfo(info.width, info.height, info.bpp) : null;
-    }
-  };
-
-  @Override
-  @NotNull
-  public ID<Integer, ImageInfo> getName() {
-    return INDEX_ID;
-  }
-
-  @Override
-  @NotNull
-  public SingleEntryIndexer<ImageInfo> getIndexer() {
-    return myDataIndexer;
-  }
-
-  @Nullable
-  public static ImageInfo getInfo(@NotNull VirtualFile file, @NotNull Project project) {
-    return ContainerUtil.getFirstItem(FileBasedIndex.getInstance().getFileData(INDEX_ID, file, project).values());
-  }
-
-  @NotNull
-  @Override
-  public DataExternalizer<ImageInfo> getValueExternalizer() {
-    return myValueExternalizer;
-  }
+  private static final VirtualFileGist<ImageInfo> ourGist =
+    GistManager.getInstance().newVirtualFileGist("ImageInfo", 1, ourValueExternalizer, (project, file) -> {
+      if (!file.isInLocalFileSystem() || file.getLength() > ourMaxImageSize) {
+        return null;
+      }
 
-  @NotNull
-  @Override
-  public FileBasedIndex.InputFilter getInputFilter() {
-    return new DefaultFileTypeSpecificInputFilter(ImageFileTypeManager.getInstance().getImageFileType(), SvgFileType.INSTANCE) {
-      @Override
-      public boolean acceptInput(@NotNull VirtualFile file) {
-        return file.isInLocalFileSystem() && file.getLength() < ourMaxImageSize;
+      FileType fileType = file.getFileType();
+      if (fileType != SvgFileType.INSTANCE && fileType != ImageFileTypeManager.getInstance().getImageFileType()) {
+        return null;
       }
-    };
-  }
 
-  @Override
-  public int getVersion() {
-    return 8;
-  }
+      byte[] content;
+      try {
+        content = file.contentsToByteArray();
+      }
+      catch (IOException e) {
+        Logger.getInstance(ImageInfoIndex.class).error(e);
+        return null;
+      }
+      ImageInfoReader.Info info = ImageInfoReader.getInfo(content);
+      return info == null ? null : new ImageInfo(info.width, info.height, info.bpp);
+    });
 }

diff --git a/images/test/org/intellij/images/index/ImageInfoIndexTest.java b/images/test/org/intellij/images/index/ImageInfoIndexTest.java
index d61b5e7aa400c569500176db3a090abc0298fc0b..ce20c06a37883eb08a330cf693e082c4997f5ac8 100644 (file)
--- a/images/test/org/intellij/images/index/ImageInfoIndexTest.java
+++ b/images/test/org/intellij/images/index/ImageInfoIndexTest.java
@@ -4,7 +4,6 @@ package org.intellij.images.index;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.fixtures.BasePlatformTestCase;
-import com.intellij.util.indexing.FileBasedIndex;
 import org.intellij.images.util.ImageInfo;
 import org.jetbrains.annotations.NotNull;
 
@@ -15,17 +14,13 @@ import static org.junit.Assert.assertNotEquals;
 public class ImageInfoIndexTest extends BasePlatformTestCase {
   public void testIndexModification() throws IOException {
     VirtualFile file = myFixture.addFileToProject("image.svg", "<svg width='300' height='300' xmlns='http://www.w3.org/2000/svg'></svg>").getVirtualFile();
-    long stamp = getIndexStamp();
     ImageInfo value = getIndexValue(file);
 
     VfsUtil.saveText(file, "<svg width='500' height='300' xmlns='http://www.w3.org/2000/svg'></svg>");
-    assertNotEquals(stamp, getIndexStamp());
     assertNotEquals(value, getIndexValue(file));
-    stamp = getIndexStamp();
     value = getIndexValue(file);
 
     VfsUtil.saveText(file, "<svg width='500' height='300' xmlns='http://www.w3.org/2000/svg'><path d=\"M10 10\"/></svg>");
-    assertEquals(stamp, getIndexStamp());
     assertEquals(value, getIndexValue(file));
   }
 
@@ -43,10 +38,6 @@ public class ImageInfoIndexTest extends BasePlatformTestCase {
     assertEquals(300, getIndexValue(file2).width);
   }
 
-  private long getIndexStamp() {
-    return FileBasedIndex.getInstance().getIndexModificationStamp(ImageInfoIndex.INDEX_ID, myFixture.getProject());
-  }
-
   private ImageInfo getIndexValue(@NotNull VirtualFile file) {
     return ImageInfoIndex.getInfo(file, myFixture.getProject());
   }