Version 0.42

This change requires the API of IntelliJ platform branch 143+.

CHANGES.md

@@ -3,6 +3,23 @@ The Changelog
 
 History of changes in IdeaVim for the IntelliJ platform.
 
+0.42, 2015-11-01
+----------------
+
+This release is compatible with IntelliJ 15+ and other IDEs based on the
+IntelliJ platform branch 143+.
+
+* VIM-970 Fixed move commands in read-only files
+
+
+0.41, 2015-06-10
+----------------
+
+A bugfix release.
+
+* VIM-957 Fixed plugin version 0.40 is not compatible with IDEs other than
+  IntelliJ
+
 
 0.40, 2015-06-09
 ----------------

README.md

@@ -2,15 +2,15 @@ IdeaVim
 =======
 
 <div>
-  <a href="http://teamcity.jetbrains.com/viewType.html?buildTypeId=bt299&guest=1">
+  <a href="http://teamcity.jetbrains.com/viewType.html?buildTypeId=IdeaVim_Build&guest=1">
-    <img src="http://teamcity.jetbrains.com/app/rest/builds/buildType:(id:bt299)/statusIcon"/>
+    <img src="http://teamcity.jetbrains.com/app/rest/builds/buildType:(id:IdeaVim_Build)/statusIcon"/>
   </a>
   <span>Build<span>
 </div>
 
 <div>
-  <a href="http://teamcity.jetbrains.com/viewType.html?buildTypeId=bt453&guest=1">
+  <a href="http://teamcity.jetbrains.com/viewType.html?buildTypeId=IdeaVim_TestsForIntelliJ15&guest=1">
-    <img src="http://teamcity.jetbrains.com/app/rest/builds/buildType:(id:bt453)/statusIcon"/>
+    <img src="http://teamcity.jetbrains.com/app/rest/builds/buildType:(id:IdeaVim_TestsForIntelliJ15)/statusIcon"/>
   </a>
   <span>Tests</span>
 </div>

build.properties

@@ -1,4 +1,4 @@
-version-id:0.40
+version-id:0.42
-platform-version:135.0
+platform-version:143.0
-idea.download.url=http://download.jetbrains.com/idea/ideaIU-14.0.2.zip
+idea.download.url=http://download.jetbrains.com/idea/ideaIC-143.380.20.tar.gz
 build.number=dev

build.xml

@@ -105,9 +105,9 @@
     <delete dir="${idea}/unzip"/>
     <mkdir dir="${idea}/unzip"/>
     <basename property="idea.filename" file="${idea.download.url}"/>
-    <unzip dest="${idea}/unzip">
+    <untar src="${idea}/${idea.filename}" dest="${idea}/unzip" compression="gzip">
-      <fileset dir="${idea}" includes="${idea.filename}"/>
+      <cutdirsmapper dirs="1"/>
-    </unzip>
+    </untar>
   </target>
 
   <target name="dist" depends="dist-src, dist-bin" description="Creates the src and bin distribution files"/>

ideavim.iml

@@ -7,9 +7,9 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/idea" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>
-

resources/META-INF/plugin.xml

@@ -2,6 +2,14 @@
   <name>IdeaVim</name>
   <id>IdeaVIM</id>
   <change-notes><![CDATA[
+      <p>0.42:</p>
+      <ul>
+        <li>Fixed move commands in read-only files</li>
+      </ul>
+      <p>0.41:</p>
+      <ul>
+        <li>Various bug fixes</li>
+      </ul>
       <p>0.40:</p>
       <ul>
         <li>Support for <code>mapleader</code></li>

src/com/maddyhome/idea/vim/EventFacade.java

@@ -42,13 +42,13 @@ public class EventFacade {
 
   public void setupTypedActionHandler(@NotNull TypedActionHandler handler) {
     final TypedAction typedAction = getTypedAction();
-    myOriginalTypedActionHandler = typedAction.getHandler();
+    myOriginalTypedActionHandler = typedAction.getRawHandler();
-    typedAction.setupHandler(handler);
+    typedAction.setupRawHandler(handler);
   }
 
   public void restoreTypedActionHandler() {
     if (myOriginalTypedActionHandler != null) {
-      getTypedAction().setupHandler(myOriginalTypedActionHandler);
+      getTypedAction().setupRawHandler(myOriginalTypedActionHandler);
     }
   }
 

src/com/maddyhome/idea/vim/helper/SearchHelper.java

@@ -25,7 +25,7 @@ import com.intellij.openapi.util.Pair;
 import com.intellij.psi.PsiComment;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.util.*;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.option.ListOption;
 import com.maddyhome.idea.vim.option.OptionChangeEvent;
@@ -166,7 +166,7 @@ public class SearchHelper {
   }
 
   private static int findMatchingBlockCommentPair(@NotNull PsiElement element, int pos) {
-    final Language language = PsiUtil.findLanguageFromElement(element);
+    final Language language = element.getLanguage();
     final Commenter commenter = LanguageCommenters.INSTANCE.forLanguage(language);
     final PsiComment comment = PsiTreeUtil.getParentOfType(element, PsiComment.class, false);
     if (comment != null) {

test/org/jetbrains/plugins/ideavim/VimTestCase.java

@@ -8,7 +8,6 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.fileTypes.PlainTextFileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.testFramework.LightProjectDescriptor;
-import com.intellij.testFramework.PlatformTestCase;
 import com.intellij.testFramework.UsefulTestCase;
 import com.intellij.testFramework.fixtures.CodeInsightTestFixture;
 import com.intellij.testFramework.fixtures.IdeaProjectTestFixture;
@@ -36,16 +35,8 @@ import java.util.List;
  * @author vlan
  */
 public abstract class VimTestCase extends UsefulTestCase {
-  private static final String ULTIMATE_MARKER_CLASS = "com.intellij.psi.css.CssFile";
   protected CodeInsightTestFixture myFixture;
 
-  public VimTestCase() {
-    // Only in IntelliJ IDEA Ultimate Edition
-    PlatformTestCase.initPlatformLangPrefix();
-    // XXX: IntelliJ IDEA Community and Ultimate 12+
-    //PlatformTestCase.initPlatformPrefix(ULTIMATE_MARKER_CLASS, "PlatformLangXml");
-  }
-
   @Override
   protected void setUp() throws Exception {
     super.setUp();