From f8d874edd9fcf47a6eafd96a04474201242b8f88 Mon Sep 17 00:00:00 2001
From: quiver2k <quiver2k@users.sourceforge.jp>
Date: Wed, 29 Jul 2009 21:25:25 +0900
Subject: [PATCH] added comment-region

---
 jp.sourceforge.moreemacs.updatesite/site.xml       |  2 +-
 jp.sourceforge.moreemacs/plugin.xml                | 17 ++++++++++++++
 .../moreemacs/handlers/CommentRegionExecution.java | 27 ++++++++++++++++++++++
 .../moreemacs/handlers/TextEditorExecution.java    |  4 +++-
 4 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/CommentRegionExecution.java

diff --git a/jp.sourceforge.moreemacs.updatesite/site.xml b/jp.sourceforge.moreemacs.updatesite/site.xml
index 0c3886d..7757c71 100644
--- a/jp.sourceforge.moreemacs.updatesite/site.xml
+++ b/jp.sourceforge.moreemacs.updatesite/site.xml
@@ -3,7 +3,7 @@
    <description url="http://moreemacs.sourceforge.jp/update-site">
       More Emacs update site
    </description>
-   <feature url="features/jp.sourceforge.moreemacs.feature_1.1.0.200907282005.jar" id="jp.sourceforge.moreemacs.feature" version="1.1.0.200907282005">
+   <feature url="features/jp.sourceforge.moreemacs.feature_1.1.0.200907291321.jar" id="jp.sourceforge.moreemacs.feature" version="1.1.0.200907291321">
       <category name="moreemacs"/>
    </feature>
    <category-def name="moreemacs" label="More Emacs">
diff --git a/jp.sourceforge.moreemacs/plugin.xml b/jp.sourceforge.moreemacs/plugin.xml
index 7c2821e..19312d1 100644
--- a/jp.sourceforge.moreemacs/plugin.xml
+++ b/jp.sourceforge.moreemacs/plugin.xml
@@ -87,6 +87,11 @@
             id="jp.sourceforge.moreemacs.CapitalizeWord"
             name="capitalize-word">
       </command>
+      <command
+            categoryId="jp.sourceforge.moreemacs.category"
+            id="jp.sourceforge.moreemacs.CommentRegion"
+            name="comment-region">
+      </command>
    </extension>
 
    <extension
@@ -187,6 +192,12 @@
                class="jp.sourceforge.moreemacs.handlers.CommandHandler">
          </class>
       </handler>
+      <handler
+            commandId="jp.sourceforge.moreemacs.CommentRegion">
+         <class
+               class="jp.sourceforge.moreemacs.handlers.CommandHandler">
+         </class>
+      </handler>
 
    </extension>
 
@@ -355,6 +366,12 @@
             schemeId="jp.sourceforge.moreemacs.moreEmacsAcceleratorConfiguration"
             sequence="M3+C">
       </key>
+      <key
+            commandId="jp.sourceforge.moreemacs.CommentRegion"
+            contextId="org.eclipse.ui.textEditorScope"
+            schemeId="jp.sourceforge.moreemacs.moreEmacsAcceleratorConfiguration"
+            sequence="M1+C M1+C">
+      </key>
    </extension>
 
 </plugin>
diff --git a/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/CommentRegionExecution.java b/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/CommentRegionExecution.java
new file mode 100644
index 0000000..c59115f
--- /dev/null
+++ b/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/CommentRegionExecution.java
@@ -0,0 +1,27 @@
+package jp.sourceforge.moreemacs.handlers;
+
+import org.eclipse.core.commands.Command;
+import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.handlers.IHandlerService;
+
+
+public final class CommentRegionExecution extends TextEditorExecution {
+    @Override
+    public void execute() throws Exception {
+        ICommandService commandService =
+            (ICommandService)textEditor.getSite().getService(ICommandService.class);
+        for(Command command: commandService.getDefinedCommands()) {
+            if(!command.isEnabled()) {
+                continue;
+            }
+            if(!command.getId().endsWith(".toggle.comment")) {
+                continue;
+            }
+            getSelection(true);
+            IHandlerService handlerService =
+                (IHandlerService)textEditor.getSite().getService(IHandlerService.class);
+            handlerService.executeCommand(command.getId(), null);
+            break;
+        }
+    }
+}
diff --git a/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/TextEditorExecution.java b/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/TextEditorExecution.java
index 56f01ae..8e3e355 100644
--- a/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/TextEditorExecution.java
+++ b/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/TextEditorExecution.java
@@ -72,7 +72,9 @@ abstract class TextEditorExecution implements Execution {
         int current = selection.getOffset();
         
         int start = (mark < current) ? mark : current;
-        textEditor.selectAndReveal(start, Math.abs(mark - current));
+        //textEditor.selectAndReveal(start, Math.abs(mark - current));
+        textViewer.setSelectedRange(start, Math.abs(mark - current));
+
         
         return (ITextSelection) textEditor
         .getSelectionProvider().getSelection();
-- 
2.11.0