8000 Fix https://github.com/angelozerr/typescript.java/issues/197 · lgrignon/typescript.java@9afc6d2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9afc6d2

Browse files
angelozerrangelozerr
committed
1 parent e79f1ad commit 9afc6d2

File tree

5 files changed

+33
-11
lines changed

5 files changed

+33
-11
lines changed

‎eclipse/jsdt/ts.eclipse.ide.jsdt.ui/plugin.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@ ActionDefinition.open.definition.editor = Open an editor on the selected element
115115
ActionDefinition.open.symbol.name=Open Symbol
116116
ActionDefinition.open.symbol.description= Open symbol
117117

118+
ActionDefinition.gotoMatchingBracket.name= Go to Matching Bracket
119+
ActionDefinition.gotoMatchingBracket.description= Moves the cursor to the matching bracket
120+
118121
##########################################################################
119122
# Debugging support
120123
##########################################################################

‎eclipse/jsdt/ts.eclipse.ide.jsdt.ui/plugin.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,12 @@
500500
id="ts.eclipse.ide.jsdt.ui.edit.text.java.search.references.in.project">
501501
</command>
502502
<!-- navigate -->
503+
<command
504+
name="%ActionDefinition.gotoMatchingBracket.name"
505+
description="%ActionDefinition.gotoMatchingBracket.description"
506+
categoryId="org.eclipse.ui.category.navigate"
507+
id="ts.eclipse.ide.jsdt.ui.edit.text.java.goto.matching.bracket">
508+
</command>
503509
<command
504510
name="%ActionDefinition.show.outline.name"
505511
description="%ActionDefinition.show.outline.description"
@@ -596,6 +602,11 @@
596602
commandId="ts.eclipse.ide.jsdt.ui.edit.text.java.search.references.in.project"
597603
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
598604
<!-- navigate -->
605+
<key
606+
sequence="M1+M2+P"
607+
contextId="ts.eclipse.ide.jsdt.ui.typeScriptViewScope"
608+
commandId="ts.eclipse.ide.jsdt.ui.edit.text.java.goto.matching.bracket"
609+
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
599610
<key
600611
sequence="M1+O"
601612
contextId="ts.eclipse.ide.jsdt.ui.typeScriptViewScope"

‎eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/internal/ui/actions/GotoMatchingBracketAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public GotoMatchingBracketAction(JavaScriptLightWeightEditor editor) {
3030
Assert.isNotNull(editor);
3131
fEditor = editor;
3232
setEnabled(true);
33-
PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IJavaHelpContextIds.GOTO_MATCHING_BRACKET_ACTION);
33+
// PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IJavaHelpContextIds.GOTO_MATCHING_BRACKET_ACTION);
3434
}
3535

3636
public void run() {

‎eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/internal/ui/editor/JavaScriptLightWeightEditor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@
6060
import org.eclipse.wst.jsdt.internal.ui.text.JavaPairMatcher;
6161
import org.eclipse.wst.jsdt.internal.ui.text.PreferencesAdapter;
6262
import org.eclipse.wst.jsdt.ui.PreferenceConstants;
63-
import org.eclipse.wst.jsdt.ui.actions.IJavaEditorActionDefinitionIds;
6463
import org.eclipse.wst.jsdt.ui.text.IJavaScriptPartitions;
6564
import org.eclipse.wst.jsdt.ui.text.JavaScriptSourceViewerConfiguration;
6665
import org.eclipse.wst.jsdt.ui.text.JavaScriptTextTools;
6766

6867
import ts.eclipse.ide.jsdt.internal.ui.JSDTTypeScriptUIMessages;
6968
import ts.eclipse.ide.jsdt.internal.ui.JSDTTypeScriptUIPlugin;
7069
import ts.eclipse.ide.jsdt.internal.ui.actions.GotoMatchingBracketAction;
70+
import ts.eclipse.ide.jsdt.ui.actions.ITypeScriptEditorActionDefinitionIds;
7171

7272
/**
7373
* TypeScript editor.
@@ -281,7 +281,7 @@ protected void createActions() {
281281
super.createActions();
282282

283283
Action action = new GotoMatchingBracketAction(this);
284-
action.setActionDefinitionId(IJavaEditorActionDefinitionIds.GOTO_MATCHING_BRACKET);
284+
action.setActionDefinitionId(ITypeScriptEditorActionDefinitionIds.GOTO_MATCHING_BRACKET);
285285
setAction(GotoMatchingBracketAction.GOTO_MATCHING_BRACKET, action);
286286

287287
/*

‎eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/ui/actions/ITypeScriptEditorActionDefinitionIds.java

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,19 @@ public interface ITypeScriptEditorActionDefinitionIds extends ITextEditorActionD
6565

6666
/**
6767
* Action definition ID of the search -> references in project action (value
68-
* <code>"ts.eclipse.ide.jsdt.ui.edit.text.java.search.references.in.project"</code>
68+
* <code>"ts.eclipse.ide.jsdt.ui.edit.text.java.search.references.in.project"</code>
6969
* ).
7070
*/
7171
public static final String SEARCH_REFERENCES_IN_PROJECT = "ts.eclipse.ide.jsdt.ui.edit.text.java.search.references.in.project"; //$NON-NLS-1$
7272

73+
/**
74+
* Action definition ID of the edit -> go to matching bracket action (value
75+
* <code>"ts.eclipse.ide.jsdt.ui.edit.text.java.goto.matching.bracket"</code>).
76+
*
77+
*
78+
*/
79+
public static final String GOTO_MATCHING_BRACKET = "ts.eclipse.ide.jsdt.ui.edit.text.java.goto.matching.bracket"; //$NON-NLS-1$
80+
7381
/**
7482
* Action definition ID of the navigate -> Show Outline action (value
7583
* <code>"ts.eclipse.ide.jsdt.ui.edit.text.java.show.outline"</code>).
@@ -85,17 +93,17 @@ public interface ITypeScriptEditorActionDefinitionIds extends ITextEditorActionD
8593
*
8694
*/
8795
public static final String OPEN_IMPLEMENTATION = "ts.eclipse.ide.jsdt.ui.edit.text.java.open.implementation"; //$NON-NLS-1$
88-
96+
8997
/**
90-
* Action definition ID of the navigate -> open action
91-
* (value <code>"ts.eclipse.ide.jsdt.ui.edit.text.java.open.editor"</code>).
98+
* Action definition ID of the navigate -> open action (value
99+
* <code>"ts.eclipse.ide.jsdt.ui.edit.text.java.open.editor"</code>).
92100
*/
93-
public static final String OPEN_EDITOR= "ts.eclipse.ide.jsdt.ui.edit.text.java.open.editor"; //$NON-NLS-1$
101+
public static final String OPEN_EDITOR = "ts.eclipse.ide.jsdt.ui.edit.text.java.open.editor"; //$NON-NLS-1$
94102

95103
/**
96-
* Action definition ID of the refactor -> rename element action
97-
* (value <code>"ts.eclipse.ide.jsdt.ui.edit.text.java.rename.element"</code>).
104+
* Action definition ID of the refactor -> rename element action (value
105+
* <code>"ts.eclipse.ide.jsdt.ui.edit.text.java.rename.element"</code>).
98106
*/
99-
public static final String RENAME_ELEMENT= "ts.eclipse.ide.jsdt.ui.edit.text.java.rename.element"; //$NON-NLS-1$
107+
public static final String RENAME_ELEMENT = "ts.eclipse.ide.jsdt.ui.edit.text.java.rename.element"; //$NON-NLS-1$
100108

101109
}

0 commit comments

Comments
 (0)
0