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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Dmitry Trofimov
2014-02-17 14:27:17 +01:00
parent 408a5af229 da9c594f0a
commit 361f27690a
10 changed files with 340 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources/src/brokenPlugins.txt
+3 -1
View File
@@ -2,10 +2,12 @@
// Each line contains plugin ID and list of versions that are broken.
// If plugin name or version contains a space you can quote it like in command line.
NodeJS 134.680 134.31 134.307 134.262 134.198 134.125
NodeJS 134.1081 134.1039 134.985 134.680 134.31 134.307 134.262 134.198 134.125
com.jetbrains.php 133.679 133.51 133.326 131.98 131.374 131.332 131.235 131.205 130.1639 130.1481 130.1176 129.91 129.814 129.672 129.362 127.67 127.100 126.334 123.66 122.875 121.62 121.390 121.215 121.12
com.jetbrains.lang.ejs 131.17 131.12
com.jetbrains.twig 133.51 130.1639
org.jetbrains.plugins.ruby 6.0.0.20140207
Pythonid 3.1
Karma 134.686 134.31
org.intellij.scala 0.32.512
org.jetbrains.kannotator 0.2.420
platform/platform-tests/testData/editor/multiCaret/EditorCloneCaretAbove-after.txt
+3
View File
@@ -0,0 +1,3 @@
s<caret>ome te<caret>xt
s<caret>ome oth<selection><caret>er t</selection>ext
a<caret>nother <selection><caret>line</selection> of text
platform/platform-tests/testData/editor/multiCaret/EditorCloneCaretAbove-before.txt
+3
View File
@@ -0,0 +1,3 @@
some te<caret>xt
s<caret>ome other text
a<caret>nother <selection><caret>line</selection> of text
platform/platform-tests/testData/editor/multiCaret/EditorCloneCaretBelow-after.txt
+3
View File
@@ -0,0 +1,3 @@
s<caret>ome text
s<caret>ome other <selection>text<caret></selection>
a<caret>not<caret>her lin<selection>e of<caret></selection> text
platform/platform-tests/testData/editor/multiCaret/EditorCloneCaretBelow-before.txt
+3
View File
@@ -0,0 +1,3 @@
s<caret>ome text
s<caret>ome other <selection>text<caret></selection>
anot<caret>her line of text
platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretStateRestoreTest.java
+66
View File
@@ -0,0 +1,66 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.openapi.editor;
import com.intellij.openapi.application.Result;
import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.editor.impl.DocumentImpl;
import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.fileEditor.HeavyFileEditorManagerTestCase;
import com.intellij.openapi.fileEditor.TextEditor;
import com.intellij.openapi.fileTypes.PlainTextFileType;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFile;
import com.intellij.testFramework.EditorTestUtil;
import org.jetbrains.annotations.NotNull;
public class EditorMultiCaretStateRestoreTest extends HeavyFileEditorManagerTestCase {
public void testRestoreState() throws Exception {
EditorTestUtil.enableMultipleCarets();
try {
String text = "some<caret> text<caret>\n" +
"some <selection><caret>other</selection> <selection>text<caret></selection>\n" +
"<selection>ano<caret>ther</selection> line";
PsiFile psiFile = myFixture.configureByText(PlainTextFileType.INSTANCE, text);
VirtualFile virtualFile = psiFile.getVirtualFile();
assertNotNull(virtualFile);
myManager.openFile(virtualFile, false);
myManager.closeAllFiles();
FileEditor[] fileEditors = myManager.openFile(virtualFile, false);
assertNotNull(fileEditors);
assertEquals(1, fileEditors.length);
Editor editor = ((TextEditor)fileEditors[0]).getEditor();
verifyEditorState(editor, text);
}
finally {
EditorTestUtil.disableMultipleCarets();
}
}
private static void verifyEditorState(Editor editor, String textWithMarkup) {
final Document document = new DocumentImpl(textWithMarkup);
EditorTestUtil.CaretsState caretAndSelectionState = new WriteCommandAction<EditorTestUtil.CaretsState>(null) {
@Override
protected void run(@NotNull Result<EditorTestUtil.CaretsState> result) throws Throwable {
result.setResult(EditorTestUtil.extractCaretAndSelectionMarkers(document));
}
}.execute().getResultObject();
assertEquals(document.getCharsSequence().toString(), editor.getDocument().getText());
EditorTestUtil.verifyCaretAndSelectionState(editor, caretAndSelectionState);
}
}
platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretTest.java
+79
View File
@@ -17,6 +17,11 @@ package com.intellij.openapi.editor;
import com.intellij.openapi.editor.ex.EditorSettingsExternalizable;
import com.intellij.openapi.editor.impl.AbstractEditorTest;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.fileEditor.OpenFileDescriptor;
import com.intellij.openapi.fileEditor.impl.EditorHistoryManager;
import com.intellij.openapi.project.ex.ProjectManagerEx;
import com.intellij.openapi.project.impl.ProjectManagerImpl;
import com.intellij.testFramework.EditorTestUtil;
import com.intellij.testFramework.TestFileType;
import com.intellij.testFramework.fixtures.EditorScrollingFixture;
@@ -142,4 +147,78 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
"long l<selection><caret>ine</selection>\n" +
"line");
}
public void testTyping() throws Exception {
init("some<caret> text<caret>\n" +
"some <selection><caret>other</selection> <selection>text<caret></selection>\n" +
"<selection>ano<caret>ther</selection> line",
TestFileType.TEXT);
type('A');
checkResultByText("someA<caret> textA<caret>\n" +
"some A<caret> A<caret>\n" +
"A<caret> line");
}
public void testCopyPaste() throws Exception {
init("<selection><caret>one</selection> two \n" +
"<selection><caret>three</selection> four ",
TestFileType.TEXT);
executeAction("EditorCopy");
executeAction("EditorLineEnd");
executeAction("EditorPaste");
checkResultByText("one twoone<caret> \n" +
"three fourthree<caret> ");
}
public void testCutAndPaste() throws Exception {
init("<selection>one<caret></selection> two \n" +
"<selection>three<caret></selection> four ",
TestFileType.TEXT);
executeAction("EditorCut");
executeAction("EditorLineEnd");
executeAction("EditorPaste");
checkResultByText(" twoone<caret> \n" +
" fourthree<caret> ");
}
public void testPasteSingleItem() throws Exception {
init("<selection>one<caret></selection> two \n" +
"three four ",
TestFileType.TEXT);
executeAction("EditorCopy");
executeAction("EditorCloneCaretBelow");
executeAction("EditorLineEnd");
executeAction("EditorPaste");
checkResultByText("one twoone<caret> \n" +
"three fourone<caret> ");
}
public void testCutAndPasteMultiline() throws Exception {
init("one <selection>two \n" +
"three<caret></selection> four \n" +
"five <selection>six \n" +
"seven<caret></selection> eight",
TestFileType.TEXT);
executeAction("EditorCut");
executeAction("EditorLineEnd");
executeAction("EditorPaste");
checkResultByText("one fourtwo \n" +
"three<caret> \n" +
"five eightsix \n" +
"seven<caret>");
}
public void testStateStoreAndLoad() throws Exception {
init("some<caret> text<caret>\n" +
"some <selection><caret>other</selection> <selection>text<caret></selection>\n" +
"<selection>ano<caret>ther</selection> line",
TestFileType.TEXT);
EditorHistoryManager.getInstance(ourProject).projectOpened();
FileEditorManager fileEditorManager = FileEditorManager.getInstance(ourProject);
fileEditorManager.closeFile(myVFile);
myEditor = fileEditorManager.openTextEditor(new OpenFileDescriptor(getProject(), myVFile, 0), false);
checkResultByText("some<caret> text<caret>\n" +
"some <selection><caret>other</selection> <selection>text<caret></selection>\n" +
"<selection>ano<caret>ther</selection> line");
}
}
platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretUndoRedoTest.java
+118
View File
@@ -0,0 +1,118 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.openapi.editor;
import com.intellij.openapi.application.Result;
import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.command.impl.CurrentEditorProvider;
import com.intellij.openapi.command.impl.UndoManagerImpl;
import com.intellij.openapi.command.undo.UndoManager;
import com.intellij.openapi.editor.ex.EditorSettingsExternalizable;
import com.intellij.openapi.editor.impl.AbstractEditorTest;
import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.fileEditor.TextEditor;
import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider;
import com.intellij.testFramework.EditorTestUtil;
import com.intellij.testFramework.TestFileType;
import com.intellij.testFramework.fixtures.EditorScrollingFixture;
import org.jetbrains.annotations.NotNull;
public class EditorMultiCaretUndoRedoTest extends AbstractEditorTest {
private CurrentEditorProvider mySavedCurrentEditorProvider;
public void setUp() throws Exception {
super.setUp();
EditorTestUtil.enableMultipleCarets();
mySavedCurrentEditorProvider = getUndoManager().getEditorProvider();
}
public void tearDown() throws Exception {
getUndoManager().setEditorProvider(mySavedCurrentEditorProvider);
EditorTestUtil.disableMultipleCarets();
super.tearDown();
}
@Override
// disabling execution of tests in command
protected void runTest() throws Throwable {
new WriteAction<Void>() {
@Override
protected void run(@NotNull Result<Void> result) throws Throwable {
doRunTest();
}
}.execute();
}
public void testUndoRedo() throws Exception {
init("some<caret> text<caret>\n" +
"some <selection><caret>other</selection> <selection>text<caret></selection>\n" +
"<selection>ano<caret>ther</selection> line",
TestFileType.TEXT);
setupEditorProvider();
type('A');
executeAction("EditorDelete");
mouse().clickAt(0, 1);
undo();
checkResult("someA<caret>textA<caret>some A<caret>A<caret>A<caret>line");
undo();
checkResult("someA<caret> textA<caret>\n" +
"some A<caret> A<caret>\n" +
"A<caret> line");
undo();
checkResult("some<caret> text<caret>\n" +
"some <selection><caret>other</selection> <selection>text<caret></selection>\n" +
"<selection>ano<caret>ther</selection> line");
redo();
checkResult("someA<caret> textA<caret>\n" +
"some A<caret> A<caret>\n" +
"A<caret> line");
}
private void checkResult(final String text) {
CommandProcessor.getInstance().runUndoTransparentAction(new Runnable() {
@Override
public void run() {
checkResultByText(text);
}
});
}
private static void undo() {
getUndoManager().undo(getTextEditor());
}
private static void redo() {
getUndoManager().redo(getTextEditor());
}
private static UndoManagerImpl getUndoManager() {
return (UndoManagerImpl) UndoManager.getInstance(ourProject);
}
private static TextEditor getTextEditor() {
return TextEditorProvider.getInstance().getTextEditor(myEditor);
}
private static void setupEditorProvider() {
getUndoManager().setEditorProvider(new CurrentEditorProvider() {
@Override
public FileEditor getCurrentEditor() {
return getTextEditor();
}
});
}
}
platform/testFramework/src/com/intellij/testFramework/EditorTestUtil.java
+33 -3
View File
@@ -17,9 +17,7 @@ package com.intellij.testFramework;
import com.intellij.ide.DataManager;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.RangeMarker;
import com.intellij.openapi.editor.*;
import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
import com.intellij.openapi.editor.actionSystem.EditorActionManager;
import com.intellij.openapi.editor.actionSystem.TypedAction;
@@ -39,6 +37,9 @@ import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
/**
* User: Maxim.Mossienko
* Date: 15.03.2010
@@ -284,6 +285,35 @@ public class EditorTestUtil {
return result;
}
public static void verifyCaretAndSelectionState(Editor editor, CaretsState caretState) {
CaretModel caretModel = editor.getCaretModel();
List<com.intellij.openapi.editor.Caret> allCarets = new ArrayList<com.intellij.openapi.editor.Caret>(caretModel.getAllCarets());
assertEquals("Unexpected number of carets", caretState.carets.size(), allCarets.size());
for (int i = 0; i < caretState.carets.size(); i++) {
String caretDescription = caretState.carets.size() == 1 ? "" : "caret " + (i + 1) + "/" + caretState.carets.size() + " ";
com.intellij.openapi.editor.Caret currentCaret = allCarets.get(i);
LogicalPosition actualCaretPosition = currentCaret.getLogicalPosition();
LogicalPosition actualSelectionStart = editor.offsetToLogicalPosition(currentCaret.getSelectionStart());
LogicalPosition actualSelectionEnd = editor.offsetToLogicalPosition(currentCaret.getSelectionEnd());
EditorTestUtil.Caret expected = caretState.carets.get(i);
if (expected.offset != null) {
LogicalPosition expectedCaretPosition = editor.offsetToLogicalPosition(expected.offset);
assertEquals(caretDescription + "unexpected caret position", expectedCaretPosition, actualCaretPosition);
}
if (expected.selection != null) {
LogicalPosition expectedSelectionStart = editor.offsetToLogicalPosition(expected.selection.getStartOffset());
LogicalPosition expectedSelectionEnd = editor.offsetToLogicalPosition(expected.selection.getEndOffset());
assertEquals(caretDescription + "unexpected selection start", expectedSelectionStart, actualSelectionStart);
assertEquals(caretDescription + "unexpected selection end", expectedSelectionEnd, actualSelectionEnd);
}
else {
assertFalse(caretDescription + "should has no selection, but was: (" + actualSelectionStart + ", " + actualSelectionEnd + ")",
currentCaret.hasSelection());
}
}
}
public static void enableMultipleCarets() {
Registry.get("editor.allow.multiple.carets").setValue(true);
}
platform/util/src/com/intellij/util/containers/OrderedSet.java
+29 -4
View File
@@ -15,13 +15,11 @@
*/
package com.intellij.util.containers;
import com.intellij.util.IncorrectOperationException;
import gnu.trove.TObjectHashingStrategy;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.Collection;
import java.util.RandomAccess;
import java.util.Set;
import java.util.*;
// have to extend ArrayList because otherwise the spliterator() methods declared in Set and List are in conflict
public class OrderedSet<T> extends ArrayList<T> implements Set<T>, RandomAccess {
@@ -40,6 +38,33 @@ public class OrderedSet<T> extends ArrayList<T> implements Set<T>, RandomAccess
myHashSet = new OpenTHashSet<T>(capacity, hashingStrategy);
}
@Override
public boolean removeAll(@NotNull Collection<?> c) {
boolean removed = false;
for (Object o : c) {
removed |= remove(o);
}
return removed;
}
@Override
public boolean retainAll(@NotNull Collection<?> c) {
boolean removed = false;
for (int i = size() - 1; i >= 0; i--) {
Object o = get(i);
if (!c.contains(o)) {
removed |= remove(o);
}
}
return removed;
}
@NotNull
@Override
public List<T> subList(int fromIndex, int toIndex) {
throw new IncorrectOperationException();
}
@Override
public boolean contains(Object o) {
return myHashSet.contains(o);