mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
Maxim.Mossienko
@@ -1401,14 +1401,18 @@ group.MarkFileAs.text=Mark File As
|
||||
action.MarkAsPlainTextAction.text=Mark as Plain Text
|
||||
action.MarkAsOriginalTypeAction.text=Mark as
|
||||
|
||||
action.Console.Execute.text=Execute Current Statement
|
||||
action.Console.Execute.description=Execute current statement in console
|
||||
action.Console.Open.text=Open Console
|
||||
action.Console.Open.description=Open console for selected entity
|
||||
action.Console.Execute.text=Execute Current Statement in One-Line Console
|
||||
action.Console.Execute.description=Execute current statement in one-line console
|
||||
action.Console.Execute.Multiline.text=Execute Current Statement in Multiline Console
|
||||
action.Console.Execute.Multiline.description=Execute current statement in multiline console
|
||||
action.Console.SplitLine.text=Split Line
|
||||
action.Console.History.Previous.text=Previous history entry
|
||||
action.Console.History.Previous.description=Previous console history entry
|
||||
action.Console.History.Next.text=Next history entry
|
||||
action.Console.History.Next.description=Next console history entry
|
||||
action.Console.History.Browse.text=Browse History
|
||||
action.Console.History.Previous.text=Previous Entry in Console History
|
||||
action.Console.History.Previous.description=Previous entry in console history
|
||||
action.Console.History.Next.text=Next Entry in Console History
|
||||
action.Console.History.Next.description=Next entry in console history
|
||||
action.Console.History.Browse.text=Browse Console History
|
||||
action.Console.History.Browse.description=Browse console history
|
||||
action.RevealIn.description=Highlights the file in platform's file manager
|
||||
action.GoToLinkTarget.text=Go to Link Target
|
||||
|
||||
@@ -1000,33 +1000,14 @@
|
||||
<keyboard-shortcut first-keystroke="ctrl shift U" />
|
||||
</action>
|
||||
|
||||
<action id="DatabaseView.PropertiesAction">
|
||||
<keyboard-shortcut first-keystroke="alt ENTER"/>
|
||||
</action>
|
||||
|
||||
<action id="Jdbc.OpenConsole"><keyboard-shortcut first-keystroke="control shift F10"/></action>
|
||||
<action id="Jpa.OpenConsole"><keyboard-shortcut first-keystroke="control shift F10"/></action>
|
||||
|
||||
<action id="Console.TableResult.PreviousPage"><keyboard-shortcut first-keystroke="control alt UP"/></action>
|
||||
<action id="Console.TableResult.NextPage"><keyboard-shortcut first-keystroke="control alt DOWN"/></action>
|
||||
<action id="Console.TableResult.Reload"><keyboard-shortcut first-keystroke="control R"/></action>
|
||||
<action id="Console.TableResult.EditValue"><keyboard-shortcut first-keystroke="F2"/><keyboard-shortcut first-keystroke="alt ENTER"/></action>
|
||||
<action id="Console.Open"><keyboard-shortcut first-keystroke="control shift F10"/></action>
|
||||
<action id="Console.Execute"><keyboard-shortcut first-keystroke="ENTER"/></action>
|
||||
<action id="Console.Execute.Multiline"><keyboard-shortcut first-keystroke="control ENTER"/></action>
|
||||
|
||||
<action id="Console.History.Next" />
|
||||
<action id="Console.History.Previous" />
|
||||
<action id="Console.History.Browse"><keyboard-shortcut first-keystroke="control alt E"/></action>
|
||||
|
||||
<action id="Console.Jdbc.Execute"><keyboard-shortcut first-keystroke="control ENTER"/></action>
|
||||
<action id="Console.Jdbc.Terminate"><keyboard-shortcut first-keystroke="control alt shift DELETE"/></action>
|
||||
|
||||
<action id="Console.Jpa.Execute"><keyboard-shortcut first-keystroke="control ENTER"/></action>
|
||||
<action id="Console.Jpa.Terminate"><keyboard-shortcut first-keystroke="control alt shift DELETE"/></action>
|
||||
<action id="Console.Jpa.GenerateSql"><keyboard-shortcut first-keystroke="control shift ENTER"/></action>
|
||||
<action id="Console.Jpa.GenerateDDL"><keyboard-shortcut first-keystroke="control alt shift ENTER"/></action>
|
||||
|
||||
<action id="Jdbc.RunSqlScript"><keyboard-shortcut first-keystroke="control shift F10"/></action>
|
||||
|
||||
<action id="Console.Execute"><keyboard-shortcut first-keystroke="ENTER"/></action>
|
||||
<action id ="Refactorings.QuickListPopupAction">
|
||||
<keyboard-shortcut first-keystroke="control alt shift T"/>
|
||||
</action>
|
||||
|
||||
@@ -454,12 +454,6 @@
|
||||
<keyboard-shortcut first-keystroke="alt HOME"/>
|
||||
</action>
|
||||
|
||||
<action id="DatabaseView.PropertiesAction">
|
||||
<keyboard-shortcut first-keystroke="meta I"/>
|
||||
</action>
|
||||
<action id="Console.TableResult.Reload" />
|
||||
|
||||
|
||||
<action id="EditorScrollUp"/> <!-- Disables meta up -->
|
||||
<action id="EditorScrollDown"/> <!-- Disables meta down -->
|
||||
<action id="FindWordAtCaret"/> <!-- Disables meta F3 -->
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
<action id="ClassNameCompletion">
|
||||
<keyboard-shortcut first-keystroke="shift alt ENTER"/>
|
||||
</action>
|
||||
<action id="Console.TableResult.Reload"/>
|
||||
<action id="ExtractMethod">
|
||||
<keyboard-shortcut first-keystroke="control R" second-keystroke="M"/>
|
||||
</action>
|
||||
|
||||
@@ -14,10 +14,6 @@
|
||||
<keyboard-shortcut first-keystroke="control alt SLASH"/>
|
||||
</action>
|
||||
<action id="Console.History.Browse"/>
|
||||
<action id="Console.TableResult.AddRow">
|
||||
<keyboard-shortcut first-keystroke="meta alt ENTER"/>
|
||||
</action>
|
||||
<action id="Console.TableResult.Reload"/>
|
||||
<action id="ExportTestResults">
|
||||
<keyboard-shortcut first-keystroke="control alt U"/>
|
||||
</action>
|
||||
|
||||
@@ -594,7 +594,9 @@
|
||||
<action id="UiDebugger" class="com.intellij.ui.debugger.ShowUiDebuggerAction"/>
|
||||
</group>
|
||||
|
||||
<action id="Console.Open" class="com.intellij.openapi.actionSystem.EmptyAction"/>
|
||||
<action id="Console.Execute" class="com.intellij.openapi.actionSystem.EmptyAction"/>
|
||||
<action id="Console.Execute.Multiline" class="com.intellij.openapi.actionSystem.EmptyAction"/>
|
||||
<action id="Console.SplitLine" class="com.intellij.openapi.actionSystem.EmptyAction" use-shortcut-of="SplitLine"/>
|
||||
<group id="Console.HistoryActions">
|
||||
<action id="Console.History.Previous" class="com.intellij.openapi.actionSystem.EmptyAction"/>
|
||||
|
||||
@@ -32,6 +32,7 @@ import gnu.trove.THashMap;
|
||||
import gnu.trove.THashSet;
|
||||
import junit.framework.TestCase;
|
||||
import org.jetbrains.annotations.NonNls;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import javax.swing.*;
|
||||
@@ -51,10 +52,8 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
|
||||
|
||||
for (Keymap keymap : KeymapManagerEx.getInstanceEx().getAllKeymaps()) {
|
||||
String failure = checkDuplicatesInKeymap(keymap, knownDuplicates);
|
||||
if (failure != null) {
|
||||
if (failMessage.length() > 0) failMessage.append("\n");
|
||||
failMessage.append(failure);
|
||||
}
|
||||
if (failMessage.length() > 0) failMessage.append("\n");
|
||||
failMessage.append(failure);
|
||||
}
|
||||
if (failMessage.length() > 0) {
|
||||
TestCase.fail(failMessage +
|
||||
@@ -90,7 +89,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
|
||||
{ "control DELETE", "EditorDeleteToWordEnd", "RemoveFromFavorites"},
|
||||
{ "control DIVIDE", "CommentByLineComment", "Images.Editor.ActualSize"},
|
||||
{ "control DOWN", "EditorScrollDown", "EditorLookupDown"},
|
||||
{ "control ENTER", "EditorSplitLine", "ViewSource", "Console.Jdbc.Execute", "Console.Jpa.Execute", "Groovy.Shell.Execute"},
|
||||
{ "control ENTER", "EditorSplitLine", "ViewSource", "Console.Execute.Multiline"},
|
||||
{ "control EQUALS", "ExpandAll", "ExpandRegion"},
|
||||
{ "control F5", "Refresh", "Rerun"},
|
||||
{ "control D", "CompareDirs", "EditorDuplicate", "CompareTwoFiles", "SendEOF", "FileChooser.GotoDesktop"},
|
||||
@@ -119,7 +118,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
|
||||
{ "shift control D", "Uml.ShowDiff", "TagDocumentationNavigation"},
|
||||
{ "shift control DOWN", "ResizeToolWindowDown", "MoveStatementDown"},
|
||||
{ "shift control ENTER", "EditorChooseLookupItemCompleteStatement", "EditorCompleteStatement", "Console.Jpa.GenerateSql"},
|
||||
{ "shift control F10", "Jdbc.OpenConsole", "Jdbc.RunSqlScript", "Jpa.OpenConsole", "RunClass", "RunTargetAction"},
|
||||
{ "shift control F10", "Console.Open", "RunClass", "RunTargetAction"},
|
||||
{ "shift control F8", "ViewBreakpoints", "EditBreakpoint"},
|
||||
{ "shift control G", "ClassTemplateNavigation", "GoToClass"},
|
||||
{ "shift control LEFT", "EditorPreviousWordWithSelection", "ResizeToolWindowLeft", },
|
||||
@@ -128,13 +127,13 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
|
||||
{ "shift control UP", "ResizeToolWindowUp", "MoveStatementUp"},
|
||||
{ "shift control alt DOWN", "VcsShowNextChangeMarker", "HtmlTableCellNavigateDown"},
|
||||
{ "shift control alt UP", "VcsShowPrevChangeMarker", "HtmlTableCellNavigateUp"},
|
||||
{ "shift control alt DELETE", "Console.Jdbc.Terminate", "Console.Jpa.Terminate"},
|
||||
{ "shift control K", "hg4idea.push", "Git.Push"},
|
||||
{ "shift control U", "ShelveChanges.UnshelveWithDialog", "EditorToggleCase"},
|
||||
{ "control E", "RecentFiles", "Vcs.ShowMessageHistory"},
|
||||
{ "control alt Z", "Vcs.RollbackChangedLines", "ChangesView.Revert"},
|
||||
});
|
||||
put("Mac OS X 10.5+", new String[][] {
|
||||
{ "F5", "CopyElement", "Console.TableResult.Reload", "UML.ApplyCurrentLayout"},
|
||||
{ "BACK_SPACE", "$Delete", "EditorBackSpace", "Images.Thumbnails.UpFolder"},
|
||||
{ "shift BACK_SPACE", "EditorBackSpace", "UsageView.Include"},
|
||||
{ "meta BACK_SPACE", "EditorDeleteLine", "$Delete"},
|
||||
@@ -324,7 +323,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
|
||||
{ "meta BACK_SPACE", "EditorDeleteToWordStart", "$Delete"},
|
||||
{ "F2", "Console.TableResult.EditValue", "QuickJavaDoc"},
|
||||
{ "F3", "GotoDeclaration", "EditSource"},
|
||||
{ "F5", "StepInto", "UML.ApplyCurrentLayout"},
|
||||
{ "F5", "StepInto", "Console.TableResult.Reload", "UML.ApplyCurrentLayout"},
|
||||
{ "control PERIOD", "EditorChooseLookupItemDot", "HippieCompletion"},
|
||||
{ "meta 1", "FileChooser.GotoHome", "ShowIntentionActions", "DuplicatesForm.SendToLeft"},
|
||||
{ "meta 3", "FileChooser.GotoModule", "GotoAction"},
|
||||
@@ -375,6 +374,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
|
||||
}
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@SuppressWarnings({"HardCodedStringLiteral"})
|
||||
private static String checkDuplicatesInKeymap(Keymap keymap, Map<String, Map<String, List<String>>> allKnownDuplicates) {
|
||||
Set<Shortcut> shortcuts = new LinkedHashSet<Shortcut>();
|
||||
|
||||
@@ -1561,7 +1561,8 @@
|
||||
</extensions>
|
||||
|
||||
<actions>
|
||||
<action id="Groovy.Shell.Execute" class="com.intellij.openapi.actionSystem.EmptyAction" text="Execute Groovy Code"
|
||||
<action id="Groovy.Shell.Execute" class="com.intellij.openapi.actionSystem.EmptyAction" use-shortcut-of="Console.Execute.Multiline"
|
||||
text="Execute Groovy Code"
|
||||
description="Execute Groovy code in console">
|
||||
<keyboard-shortcut first-keystroke="control ENTER" keymap="$default"/>
|
||||
</action>
|
||||
|
||||
Reference in New Issue
Block a user