Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #174 Contextual menu for comments commands #175

Merged
merged 1 commit into from
Aug 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 44 additions & 21 deletions org.eclipse.tm4e.languageconfiguration/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -141,39 +141,21 @@
class="org.eclipse.tm4e.languageconfiguration.ToggleLineCommentHandler"
commandId="org.eclipse.tm4e.languageconfiguration.togglelinecommentcommand">
<enabledWhen>
<with
variable="activeEditor">
<test
property="org.eclipse.tm4e.languageconfiguration.hasLanguageConfiguration"
forcePluginActivation="true">
</test>
</with>
<reference definitionId="org.eclipse.tm4e.languageconfiguration.hasLanguageConfiguration"/>
</enabledWhen>
</handler>
<handler
class="org.eclipse.tm4e.languageconfiguration.ToggleLineCommentHandler"
commandId="org.eclipse.tm4e.languageconfiguration.addblockcommentcommand">
<enabledWhen>
<with
variable="activeEditor">
<test
property="org.eclipse.tm4e.languageconfiguration.hasLanguageConfiguration"
forcePluginActivation="true">
</test>
</with>
<reference definitionId="org.eclipse.tm4e.languageconfiguration.hasLanguageConfiguration"/>
</enabledWhen>
</handler>
<handler
class="org.eclipse.tm4e.languageconfiguration.ToggleLineCommentHandler"
commandId="org.eclipse.tm4e.languageconfiguration.removeblockcommentcommand">
<enabledWhen>
<with
variable="activeEditor">
<test
property="org.eclipse.tm4e.languageconfiguration.hasLanguageConfiguration"
forcePluginActivation="true">
</test>
</with>
<reference definitionId="org.eclipse.tm4e.languageconfiguration.hasLanguageConfiguration"/>
</enabledWhen>
</handler>
</extension>
Expand All @@ -187,4 +169,45 @@
type="java.lang.Object">
</propertyTester>
</extension>
<extension
point="org.eclipse.ui.menus">
<menuContribution
allPopups="true"
locationURI="popup:org.eclipse.ui.genericeditor.source.menu?after=additions">
<command
commandId="org.eclipse.tm4e.languageconfiguration.togglelinecommentcommand"
style="push">
<visibleWhen>
<reference definitionId="org.eclipse.tm4e.languageconfiguration.hasLanguageConfiguration"/>
</visibleWhen>
</command>
<command
commandId="org.eclipse.tm4e.languageconfiguration.addblockcommentcommand"
style="push">
<visibleWhen>
<reference definitionId="org.eclipse.tm4e.languageconfiguration.hasLanguageConfiguration"/>
</visibleWhen>
</command>
<command
commandId="org.eclipse.tm4e.languageconfiguration.removeblockcommentcommand"
style="push">
<visibleWhen>
<reference definitionId="org.eclipse.tm4e.languageconfiguration.hasLanguageConfiguration"/>
</visibleWhen>
</command>
</menuContribution>
</extension>
<extension
point="org.eclipse.core.expressions.definitions">
<definition
id="org.eclipse.tm4e.languageconfiguration.hasLanguageConfiguration">
<with
variable="activeEditor">
<test
property="org.eclipse.tm4e.languageconfiguration.hasLanguageConfiguration"
forcePluginActivation="true">
</test>
</with>
</definition>
</extension>
</plugin>
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public void customizeDocumentCommand(IDocument document, DocumentCommand command
continue;
}
command.text += autoClosingPair.getValue();
command.caretOffset = command.offset + autoClosingPair.getValue().length();
command.caretOffset = command.offset + 1;
command.shiftsCaret = false;
break;
}
Expand Down