Fixed source API compatibility with branch 171

Fixed . reseting the last find movement

AUTHORS.md

@@ -39,6 +39,7 @@ Contributors:
 * [Daniel Leong](mailto:falcone88@gmail.com)
 * [Aleksey Lagoshin](mailto:aleksey@pri-num.com)
 * [Paulo Bu](mailto:pbu_98@yahoo.com)
+* [Giorgos Gaganis](mailto:gaganis@yahoo.com)
 
 If you are a contributor and your name is not listed here, feel free to
 contact the maintainer.

CHANGES.md

@@ -17,6 +17,28 @@ Please note that the quality of EAP versions may at times be way below even
 usual beta standards.
 
 
+0.48, 2017-01-15
+----------------
+
+A bugfix release.
+
+Bug fixes:
+
+* [VIM-1205](https://youtrack.jetbrains.com/issue/VIM-1205) Don't move key handling into separate event for raw handlers
+* [VIM-1216](https://youtrack.jetbrains.com/issue/VIM-1216) Fixed `.` resetting the last find movement while repeating change that also uses movement
+
+
+0.47, 2016-10-19
+----------------
+
+A bugfix release.
+
+Bug fixes:
+
+* VIM-1098 Don't start visual selection when mouse click was actually drag over single character
+* VIM-1190 Fixed exception "Write access is allowed from write-safe contexts only"
+
+
 0.46, 2016-07-07
 ----------------
 

build.gradle

@@ -1,7 +1,19 @@
-plugins {
-  id "org.jetbrains.intellij" version "0.0.39"
+buildscript {
+  repositories {
+    mavenCentral()
+    maven {
+      url "https://oss.sonatype.org/content/repositories/snapshots/"
+    }
+    maven {
+      url 'http://dl.bintray.com/jetbrains/intellij-plugin-service'
+    }
+  }
+  dependencies {
+    classpath "org.jetbrains.intellij.plugins:gradle-intellij-plugin:0.2.0-SNAPSHOT"
+  }
 }
 
+apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'java'
 
 sourceCompatibility = javaVersion
@@ -26,8 +38,7 @@ intellij {
   downloadSources Boolean.valueOf(downloadIdeaSources)
 
   publish {
-      pluginId '164'
-      channel publishChannel
+      channels publishChannels.split(',')
       username publishUsername
       password publishPassword
   }

gradle.properties

@@ -1,7 +1,7 @@
-ideaVersion IC-15.0.2
+ideaVersion IC-15.0.5
 downloadIdeaSources true
 version SNAPSHOT
 javaVersion 1.6
 publishUsername username
 publishPassword password
-publishChannel eap
+publishChannels eap

resources/META-INF/plugin.xml

@@ -2,6 +2,14 @@
   <name>IdeaVim</name>
   <id>IdeaVIM</id>
   <change-notes><![CDATA[
+      <p>0.48:</p>
+      <ul>
+        <li>Various bug fixes</li>
+      </ul>
+      <p>0.47:</p>
+      <ul>
+        <li>Various bug fixes</li>
+      </ul>
       <p>0.46:</p>
       <ul>
         <li>Support for <code>incsearch</code> option for showing search results while typing</li>
@@ -18,42 +26,6 @@
       <ul>
         <li>Fixed running the plugin with Java 6</li>
       </ul>
-      <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>
-        <li>Support comments in <code>%</code> brace matching</li>
-        <li>Various bug fixes</li>
-      </ul>
-      <p>0.39:</p>
-      <ul>
-        <li>Various bug fixes</li>
-      </ul>
-      <p>0.38:</p>
-      <ul>
-        <li>Support for <code>:action</code> and <code>:actionlist</code> for executing arbitrary IDE actions</li>
-        <li>Support for <code>number</code> and <code>relativenumber</code> options</li>
-        <li>Support for <code>clipboard=unnamed</code> option</li>
-        <li>Various bug fixes</li>
-      </ul>
-      <p>0.37:</p>
-      <ul>
-        <li>Various bug fixes</li>
-      </ul>
-      <p>0.36:</p>
-      <ul>
-        <li>Window commands from the <code>&lt;C-W&gt;</code> family</li>
-        <li>Support for <code>:split</code>/<code>:vsplit</code> commands</li>
-        <li>Fixed visual block selection mode</li>
-        <li>Various bug fixes</li>
-      </ul>
       <p>See also the complete <a href="https://github.com/JetBrains/ideavim/blob/master/CHANGES.md">changelog</a>.</p>
     ]]></change-notes>
   <description><![CDATA[

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

@@ -49,18 +49,12 @@ public class VimTypedActionHandler implements TypedActionHandler {
   @Override
   public void execute(@NotNull final Editor editor, final char charTyped, @NotNull final DataContext context) {
     if (isEnabled(editor)) {
-      // Run key handler outside of the key typed command for creating our own undoable commands
-      SwingUtilities.invokeLater(new Runnable() {
-        @Override
-        public void run() {
-          try {
-            handler.handleKey(editor, KeyStroke.getKeyStroke(charTyped), new EditorDataContext(editor));
-          }
-          catch (Throwable e) {
-            logger.error(e);
-          }
-        }
-      });
+      try {
+        handler.handleKey(editor, KeyStroke.getKeyStroke(charTyped), new EditorDataContext(editor));
+      }
+      catch (Throwable e) {
+        logger.error(e);
+      }
     }
     else {
       origHandler.execute(editor, charTyped, context);

src/com/maddyhome/idea/vim/action/VimShortcutKeyAction.java

@@ -98,18 +98,12 @@ public class VimShortcutKeyAction extends AnAction implements DumbAware {
         notifyAboutShortcutConflict(keyStroke);
       }
       // Should we use InjectedLanguageUtil.getTopLevelEditor(editor) here, as we did in former EditorKeyHandler?
-      // Run key handler later to restore input events sequence due to VimTypedActionHandler
-      SwingUtilities.invokeLater(new Runnable() {
-        @Override
-        public void run() {
-          try {
-            KeyHandler.getInstance().handleKey(editor, keyStroke, new EditorDataContext(editor));
-          }
-          catch (Throwable throwable) {
-            ourLogger.error(throwable);
-          }
-        }
-      });
+      try {
+        KeyHandler.getInstance().handleKey(editor, keyStroke, new EditorDataContext(editor));
+      }
+      catch (Throwable throwable) {
+        ourLogger.error(throwable);
+      }
     }
   }
 

src/com/maddyhome/idea/vim/action/change/RepeatChangeAction.java

@@ -41,6 +41,7 @@ public class RepeatChangeAction extends EditorAction {
     public boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command command) {
       CommandState state = CommandState.getInstance(editor);
       Command cmd = state.getLastChangeCommand();
+
       if (cmd != null) {
         if (command.getRawCount() > 0) {
           cmd.setCount(command.getCount());
@@ -53,6 +54,9 @@ public class RepeatChangeAction extends EditorAction {
           }
         }
         Command save = state.getCommand();
+        int lastFTCmd = VimPlugin.getMotion().getLastFTCmd();
+        char lastFTChar = VimPlugin.getMotion().getLastFTChar();
+
         state.setCommand(cmd);
         state.pushState(CommandState.Mode.REPEAT, CommandState.SubMode.NONE, MappingMode.NORMAL);
         char reg = VimPlugin.getRegister().getCurrentRegister();
@@ -67,6 +71,7 @@ public class RepeatChangeAction extends EditorAction {
         if (save != null) {
           state.setCommand(save);
         }
+        VimPlugin.getMotion().setLastFTCmd(lastFTCmd, lastFTChar);
         state.saveLastChangeCommand(cmd);
         VimPlugin.getRegister().selectRegister(reg);
 

src/com/maddyhome/idea/vim/ex/handler/EditFileHandler.java

@@ -19,6 +19,7 @@
 package com.maddyhome.idea.vim.ex.handler;
 
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
 import com.maddyhome.idea.vim.KeyHandler;
 import com.maddyhome.idea.vim.VimPlugin;
@@ -29,8 +30,6 @@ import com.maddyhome.idea.vim.ex.ExException;
 import com.maddyhome.idea.vim.helper.EditorDataContext;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
-
 public class EditFileHandler extends CommandHandler {
   public EditFileHandler() {
     super(new CommandName[]{
@@ -56,7 +55,7 @@ public class EditFileHandler extends CommandHandler {
     }
 
     // Don't open a choose file dialog under a write action
-    SwingUtilities.invokeLater(new Runnable() {
+    ApplicationManager.getApplication().invokeLater(new Runnable() {
       @Override
       public void run() {
         KeyHandler.executeAction("OpenFile", new EditorDataContext(editor));

src/com/maddyhome/idea/vim/ex/handler/FindClassHandler.java

@@ -19,6 +19,7 @@
 package com.maddyhome.idea.vim.ex.handler;
 
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
 import com.maddyhome.idea.vim.KeyHandler;
 import com.maddyhome.idea.vim.VimPlugin;
@@ -27,8 +28,6 @@ import com.maddyhome.idea.vim.ex.ExCommand;
 import com.maddyhome.idea.vim.ex.ExException;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
-
 /**
  *
  */
@@ -48,7 +47,7 @@ public class FindClassHandler extends CommandHandler {
       return res;
     }
 
-    SwingUtilities.invokeLater(new Runnable() {
+    ApplicationManager.getApplication().invokeLater(new Runnable() {
       public void run() {
         KeyHandler.executeAction("GotoClass", context);
       }

src/com/maddyhome/idea/vim/ex/handler/FindFileHandler.java

@@ -19,6 +19,7 @@
 package com.maddyhome.idea.vim.ex.handler;
 
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
 import com.maddyhome.idea.vim.KeyHandler;
 import com.maddyhome.idea.vim.VimPlugin;
@@ -27,8 +28,6 @@ import com.maddyhome.idea.vim.ex.ExCommand;
 import com.maddyhome.idea.vim.ex.ExException;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
-
 /**
  *
  */
@@ -48,7 +47,7 @@ public class FindFileHandler extends CommandHandler {
       return res;
     }
 
-    SwingUtilities.invokeLater(new Runnable() {
+    ApplicationManager.getApplication().invokeLater(new Runnable() {
       public void run() {
         KeyHandler.executeAction("GotoFile", context);
       }

src/com/maddyhome/idea/vim/ex/handler/FindSymbolHandler.java

@@ -19,6 +19,7 @@
 package com.maddyhome.idea.vim.ex.handler;
 
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
 import com.maddyhome.idea.vim.KeyHandler;
 import com.maddyhome.idea.vim.ex.CommandHandler;
@@ -26,8 +27,6 @@ import com.maddyhome.idea.vim.ex.ExCommand;
 import com.maddyhome.idea.vim.ex.ExException;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
-
 /**
  *
  */
@@ -38,7 +37,7 @@ public class FindSymbolHandler extends CommandHandler {
 
   public boolean execute(@NotNull Editor editor, @NotNull final DataContext context, @NotNull ExCommand cmd) throws ExException {
     // TODO: Check the command argument and jump to a specific symbol
-    SwingUtilities.invokeLater(new Runnable() {
+    ApplicationManager.getApplication().invokeLater(new Runnable() {
       public void run() {
         KeyHandler.executeAction("GotoSymbol", context);
       }

src/com/maddyhome/idea/vim/group/KeyGroup.java

@@ -182,7 +182,7 @@ public class KeyGroup {
     final KeymapManagerEx keymapManager = KeymapManagerEx.getInstanceEx();
     final Keymap keymap = keymapManager.getActiveKeymap();
     final KeyboardShortcut shortcut = new KeyboardShortcut(keyStroke, null);
-    final Map<String, ArrayList<KeyboardShortcut>> conflicts = keymap.getConflicts("", shortcut);
+    final Map<String, ? extends List<KeyboardShortcut>> conflicts = keymap.getConflicts("", shortcut);
     final List<AnAction> actions = new ArrayList<AnAction>();
     for (String actionId : conflicts.keySet()) {
       final AnAction action = ActionManagerEx.getInstanceEx().getAction(actionId);

src/com/maddyhome/idea/vim/group/MacroGroup.java

@@ -19,6 +19,7 @@
 package com.maddyhome.idea.vim.group;
 
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
@@ -127,7 +128,7 @@ public class MacroGroup {
       }
     };
 
-    SwingUtilities.invokeLater(new Runnable() {
+    ApplicationManager.getApplication().invokeLater(new Runnable() {
       public void run() {
         CommandProcessor.getInstance().executeCommand(project, run, "Vim Macro Playback", keys.get(pos));
       }
@@ -137,7 +138,7 @@ public class MacroGroup {
   public void postKey(@NotNull KeyStroke stroke, @NotNull Editor editor) {
     final Component component = SwingUtilities.getAncestorOfClass(Window.class, editor.getComponent());
     final KeyEvent event = createKeyEvent(stroke, component);
-    SwingUtilities.invokeLater(new Runnable() {
+    ApplicationManager.getApplication().invokeLater(new Runnable() {
       public void run() {
         if (logger.isDebugEnabled()) {
           logger.debug("posting " + event);

src/com/maddyhome/idea/vim/group/MotionGroup.java

@@ -21,6 +21,7 @@ import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.*;
 import com.intellij.openapi.editor.event.*;
+import com.intellij.openapi.editor.ex.DocumentEx;
 import com.intellij.openapi.editor.ex.util.EditorUtil;
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.fileEditor.FileEditorManagerAdapter;
@@ -149,14 +150,11 @@ public class MotionGroup {
     ExOutputModel.getInstance(editor).clear();
 
     CommandState.SubMode visualMode = CommandState.SubMode.NONE;
-    switch (event.getClickCount() % 3) {
-      case 1: // Single click or quad click
-        visualMode = CommandState.SubMode.NONE;
-        break;
-      case 2: // Double click
+    switch (event.getClickCount()) {
+      case 2:
         visualMode = CommandState.SubMode.VISUAL_CHARACTER;
         break;
-      case 0: // Triple click
+      case 3:
         visualMode = CommandState.SubMode.VISUAL_LINE;
         // Pop state of being in Visual Char mode
         if (CommandState.getInstance(editor).getMode() == CommandState.Mode.VISUAL) {
@@ -247,6 +245,7 @@ public class MotionGroup {
 
     int start = editor.getSelectionModel().getSelectionStart();
     int end = editor.getSelectionModel().getSelectionEnd();
+    if (start == end) return;
 
     if (mode == CommandState.SubMode.VISUAL_LINE) {
       end--;
@@ -1730,15 +1729,16 @@ public class MotionGroup {
     private boolean myMakingChanges = false;
 
     public void selectionChanged(@NotNull SelectionEvent selectionEvent) {
-      if (myMakingChanges) {
+      final Editor editor = selectionEvent.getEditor();
+      final Document document = editor.getDocument();
+      if (myMakingChanges || (document instanceof DocumentEx && ((DocumentEx)document).isInEventsHandling())) {
         return;
       }
 
       myMakingChanges = true;
       try {
-        final Editor editor = selectionEvent.getEditor();
         final com.intellij.openapi.util.TextRange newRange = selectionEvent.getNewRange();
-        for (Editor e : EditorFactory.getInstance().getEditors(editor.getDocument())) {
+        for (Editor e : EditorFactory.getInstance().getEditors(document)) {
           if (!e.equals(editor)) {
             e.getSelectionModel().setSelection(newRange.getStartOffset(), newRange.getEndOffset());
           }
@@ -1811,6 +1811,14 @@ public class MotionGroup {
     private int endOff;
   }
 
+  public int getLastFTCmd() {
+    return lastFTCmd;
+  }
+
+  public char getLastFTChar() {
+    return lastFTChar;
+  }
+
   private int lastFTCmd = 0;
   private char lastFTChar;
   private int visualStart;

src/com/maddyhome/idea/vim/ui/ExOutputPanel.java

@@ -18,6 +18,7 @@
 
 package com.maddyhome.idea.vim.ui;
 
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.ui.components.JBScrollPane;
@@ -262,7 +263,7 @@ public class ExOutputPanel extends JPanel {
   }
 
   private void close(@Nullable final KeyEvent e) {
-    SwingUtilities.invokeLater(new Runnable() {
+    ApplicationManager.getApplication().invokeLater(new Runnable() {
       public void run() {
         deactivate(true);
 

test/org/jetbrains/plugins/ideavim/action/ChangeActionTest.java

@@ -572,4 +572,8 @@ public class ChangeActionTest extends VimTestCase {
                           "<caret>\n" +
                           "and some text after\n");
   }
+
+  public void testRepeatChangeWordDoesNotBreakNextRepeatFind() {
+    doTest(parseKeys("fXcfYPATATA<Esc>fX.;."), "<caret>aaaaXBBBBYaaaaaaaXBBBBYaaaaaaXBBBBYaaaaaaaa\n", "aaaaPATATAaaaaaaaPATATAaaaaaaPATATAaaaaaaaa\n");
+  }
 }