add column text selection support #249

Signed-off-by: Andre Bossert <anb0s@anbos.de>

Author: anb0s

plugin/src/de/anbos/eclipse/easyshell/plugin/misc/ResourceUtils.java

@@ -28,6 +28,7 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.jface.text.ITextSelection;
+import org.eclipse.jface.text.IBlockTextSelection;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IFileEditorInput;
@@ -60,11 +61,10 @@ static public ISelection getResourceSelection(Object obj) {
                     }
                 }
                 if (editor != null) {
-                    ITextSelection sel = (ITextSelection)editor.getSelectionProvider().getSelection();
                     //String text = sel.getText();
                     //selection = getSelectionFromText(resource, text);
                     if (resource != null) {
-                      resource.setTextSelection(sel);
+                      resource.setTextSelection(editor.getSelectionProvider().getSelection());
                     }
                 }
             } else if (obj instanceof IWorkbenchPart) {

plugin/src/de/anbos/eclipse/easyshell/plugin/types/Resource.java

@@ -20,7 +20,9 @@
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.jface.text.IBlockTextSelection;
 import org.eclipse.jface.text.ITextSelection;
+import org.eclipse.jface.viewers.ISelection;
 
 import de.anbos.eclipse.easyshell.plugin.Activator;
 import de.anbos.eclipse.easyshell.plugin.misc.ResourceUtils;
@@ -31,7 +33,7 @@ public class Resource {
     // internal
     private File file = null;
     private IResource resource = null;
-    private ITextSelection textSelection = null;
+    private ISelection textSelection = null;
 
     // resolved
     private String projectName = Activator.getResourceString("easyshell.plugin.name");
@@ -42,7 +44,7 @@ public Resource(Resource myRes) {
         this.textSelection = myRes.getTextSelection();
     }
 
-    public Resource(File file, IResource resource, ITextSelection textSelection) {
+    public Resource(File file, IResource resource, ISelection textSelection) {
         this.file = file;
         this.resource = resource;
         this.textSelection = textSelection;
@@ -56,6 +58,10 @@ public Resource(IResource resource) {
         this(resource.getLocation().toFile(), resource, null);
     }
 
+    public void setTextSelection(ISelection textSelection) {
+        this.textSelection = textSelection;
+    }
+
     public File getFile() {
         return file;
     }
@@ -64,7 +70,7 @@ public IResource getResource() {
         return resource;
     }
 
-    public ITextSelection getTextSelection() {
+    public ISelection getTextSelection() {
       return textSelection;
     }
 
@@ -160,38 +166,46 @@ public String getResourcePath() {
     }
 
     public String getSelectedTextStartLine() {
-      if (textSelection != null) {
-          return String.valueOf(textSelection.getStartLine()+1);
-      }
-      return "";
+        if (textSelection != null && textSelection instanceof ITextSelection) {
+            return String.valueOf(((ITextSelection)textSelection).getStartLine()+1);
+        }
+        return "";
     }
 
     public String getSelectedTextEndLine() {
-      if (textSelection != null) {
-          return String.valueOf(textSelection.getEndLine()+1);
-      }
-      return "";
+        if (textSelection != null && textSelection instanceof ITextSelection) {
+            return String.valueOf(((ITextSelection)textSelection).getEndLine()+1);
+        }
+        return "";
     }
 
     public String getSelectedTextLength() {
-      if (textSelection != null) {
-          return String.valueOf(textSelection.getLength());
-      }
-      return "";
+        if (textSelection != null) {
+            if (textSelection instanceof IBlockTextSelection) {
+                return String.valueOf(((IBlockTextSelection)textSelection).getText().length());
+            } else {
+                return String.valueOf(((ITextSelection)textSelection).getLength());
+            }
+        }
+        return "";
     }
 
     public String getSelectedTextOffset() {
-      if (textSelection != null) {
-          return String.valueOf(textSelection.getOffset());
-      }
-      return "";
+        if (textSelection != null && textSelection instanceof ITextSelection) {
+            return String.valueOf(((ITextSelection)textSelection).getOffset());
+        }
+        return "";
     }
 
     public String getSelectedText() {
-      if (textSelection != null) {
-          return textSelection.getText();
-      }
-      return "";
+        if (textSelection != null) {
+            if (textSelection instanceof IBlockTextSelection) {
+                return ((IBlockTextSelection)textSelection).getText();
+            } else {
+                return ((ITextSelection)textSelection).getText();
+            }
+        }
+        return "";
     }
 
     public String getProjectLocation() {
@@ -325,8 +339,4 @@ public String getScriptBash(String parameter) {
         return file != null && file.exists() ? file.getAbsolutePath() : "file does not exists";
     }
 
-    public void setTextSelection(ITextSelection sel) {
-      textSelection = sel;
-    }
-
 }