feat: add new variables for relative location pathes to project and

workspace

- resource_loc_path: relative location path of file or directory (to
workspace)
- resource_project_path: relative path of file or directory (to project)
- resource_project_loc_path: relative location path of file or directory
(to project)
- container_loc_path: relative location path of file's parent directory
or directory itself (to workspace)
- container_project_path: relative path of file's parent directory or
directory itself (to project)
- container_project_loc_path: relative location path of file's parent
directory or directory itself (to project)
- parent_loc_path: relative location path of parent directory (to
workspace); for files it's equal to ${easyshell:container_loc_path}
- parent_project_path: relative path of parent directory (to project);
for files it's equal to ${easyshell:container_project_path}
- parent_project_loc_path: relative location path of parent directory
(to project); for files it's equal to
${easyshell:container_project_loc_path}
- project_loc_name: location name (folder) of project
- project_parent_loc: absolute path of project's parent
- workspace_loc: absolute path of workspace
- workspace_loc_name: location name (folder) of workspace

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

Author: anb0s

README.md

@@ -163,22 +163,35 @@ The following substitution variables are available for building the command:
 - ```${easyshell:resource_name}``` = name of file or directory
 - ```${easyshell:resource_basename}``` = name of file without extension
 - ```${easyshell:resource_extension}``` = extension of file name (without '.')
-- ```${easyshell:resource_path}``` = relative path to workspace of file or directory
+- ```${easyshell:resource_path}``` = relative path of file or directory (to workspace)
+- ```${easyshell:resource_loc_path}``` = relative location path of file or directory (to workspace)
+- ```${easyshell:resource_project_path}``` = relative path of file or directory (to project)
+- ```${easyshell:resource_project_loc_path}``` = relative location path of file or directory (to project)
 - ```${easyshell:resource_line_number}``` = line number (within view or editor)
-- ```${easyshell:selected_text_start_line}``` = selected text start line (within view or editor), it's equal to ${easyshell:resource_line_number}
+- ```${easyshell:selected_text_start_line}``` = selected text start line (within view or editor), it's equal to ```${easyshell:resource_line_number}```
 - ```${easyshell:selected_text_end_line}``` = selected text end line (within view or editor)
 - ```${easyshell:selected_text_length}``` = selected text length (within view or editor)
 - ```${easyshell:selected_text_offset}``` = selected text offset (within view or editor)
 - ```${easyshell:selected_text}``` = selected text (within view or editor)
 - ```${easyshell:container_loc}``` = absolute path of file directory or directory itself
 - ```${easyshell:container_name}``` = name of file directory or directory itself
-- ```${easyshell:container_path}``` = relative path to workspace of file directory or directory itself
-- ```${easyshell:parent_loc}``` = absolute path of parent directory, for files it's equal to ${easyshell:container_loc}
-- ```${easyshell:parent_name}``` = name of parent directory, for files it's equal to ${easyshell:container_name}
-- ```${easyshell:parent_path}``` = relative path to workspace of parent directory, for files it's equal to ${easyshell:container_path}
+- ```${easyshell:container_path}``` = relative path of file directory or directory itself (to workspace)
+- ```${easyshell:container_loc_path}``` = relative location path of file's parent directory or directory itself (to workspace)
+- ```${easyshell:container_project_path}``` = relative path of file's parent directory or directory itself (to project)
+- ```${easyshell:container_project_loc_path}``` = relative location path of file's parent directory or directory itself (to project)
+- ```${easyshell:parent_loc}``` = absolute path of parent directory, for files it's equal to ```${easyshell:container_loc}```
+- ```${easyshell:parent_name}``` = name of parent directory, for files it's equal to ```${easyshell:container_name}```
+- ```${easyshell:parent_path}``` = relative path to workspace of parent directory, for files it's equal to ```${easyshell:container_path}```
+- ```${easyshell:parent_loc_path}``` = relative location path of parent directory (to workspace); for files it's equal to ```${easyshell:container_loc_path}```
+- ```${easyshell:parent_project_path}``` = relative path of parent directory (to project); for files it's equal to ```${easyshell:container_project_path}```
+- ```${easyshell:parent_project_loc_path}``` = relative location path of parent directory (to project); for files it's equal to ```${easyshell:container_project_loc_path}```
 - ```${easyshell:project_loc}``` = absolute path of project
 - ```${easyshell:project_name}``` = name of project
 - ```${easyshell:project_path}``` = relative path to workspace of project
+- ```${easyshell:project_loc_name}``` = location name (folder) of project
+- ```${easyshell:project_parent_loc}``` = absolute path of project's parent
+- ```${easyshell:workspace_loc}``` = absolute path of workspace
+- ```${easyshell:workspace_loc_name}``` = location name (folder) of workspace
 - ```${easyshell:windows_drive}``` = drive letter of file or directory on Windows
 - ```${easyshell:qualified_name}``` = full qualified (class) name
 - ```${easyshell:line_separator}``` = line separator, e.g. '\\n' (Unix) or '\\r\\n' (Windows)

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

@@ -17,6 +17,8 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.FileLocator;
@@ -119,6 +121,45 @@ public String getContainerPath() {
         return "";
     }
 
+    public String getContainerLocPath() {
+        if (resource != null) {
+            Path basePath = Paths.get(resource.getProject().getRawLocation().toFile().getParentFile().toURI());
+            Path resourcePath = null;
+            if (resource.getType() == IResource.FILE) {
+                resourcePath = Paths.get(resource.getRawLocation().toFile().getParentFile().toURI());
+            } else {
+                resourcePath = Paths.get(resource.getRawLocationURI());
+            }
+            return basePath.relativize(resourcePath).toString();
+        }
+        return "";
+    }
+
+    public String getContainerProjectPath() {
+        if (resource != null) {
+            if (resource.getType() == IResource.FILE) {
+                return resource.getParent().getProjectRelativePath().toString();
+            } else {
+                return resource.getProjectRelativePath().toString();
+            }
+        }
+        return "";
+    }
+
+    public String getContainerProjectLocPath() {
+        if (resource != null) {
+            Path basePath = Paths.get(resource.getProject().getRawLocation().toFile().toURI());
+            Path resourcePath = null;
+            if (resource.getType() == IResource.FILE) {
+                resourcePath = Paths.get(resource.getRawLocation().toFile().getParentFile().toURI());
+            } else {
+                resourcePath = Paths.get(resource.getRawLocationURI());
+            }
+            return basePath.relativize(resourcePath).toString();
+        }
+        return "";
+    }
+
     public String getParentLocation() {
         return file.getParent();
     }
@@ -138,6 +179,31 @@ public String getParentPath() {
         return "";
     }
 
+    public String getParentLocPath() {
+        if (resource != null) {
+            Path basePath = Paths.get(resource.getProject().getRawLocation().toFile().getParentFile().toURI());
+            Path resourcePath = Paths.get(resource.getRawLocation().toFile().getParentFile().toURI());
+            return basePath.relativize(resourcePath).toString();
+        }
+        return "";
+    }
+
+    public String getParentProjectPath() {
+        if (resource != null) {
+            return resource.getParent().getProjectRelativePath().toString();
+        }
+        return "";
+    }
+
+    public String getParentProjectLocPath() {
+        if (resource != null) {
+            Path basePath = Paths.get(resource.getProject().getRawLocation().toFile().toURI());
+            Path resourcePath = Paths.get(resource.getRawLocation().toFile().getParentFile().toURI());
+            return basePath.relativize(resourcePath).toString();
+        }
+        return "";
+    }
+
     public String getResourceLocation() {
         return file.getPath();
     }
@@ -165,6 +231,31 @@ public String getResourcePath() {
         return "";
     }
 
+    public String getResourceLocPath() {
+        if (resource != null) {
+            Path basePath = Paths.get(resource.getProject().getRawLocation().toFile().getParentFile().toURI());
+            Path resourcePath = Paths.get(resource.getRawLocation().toFile().toURI());
+            return basePath.relativize(resourcePath).toString();
+        }
+        return "";
+    }
+
+    public String getResourceProjectPath() {
+        if (resource != null) {
+            return resource.getProjectRelativePath().toString();
+        }
+        return "";
+    }
+
+    public String getResourceProjectLocPath() {
+        if (resource != null) {
+            Path basePath = Paths.get(resource.getProject().getRawLocation().toFile().toURI());
+            Path resourcePath = Paths.get(resource.getRawLocation().toFile().toURI());
+            return basePath.relativize(resourcePath).toString();
+        }
+        return "";
+    }
+
     public String getSelectedTextStartLine() {
         if (textSelection != null && textSelection instanceof ITextSelection) {
             return String.valueOf(((ITextSelection)textSelection).getStartLine()+1);
@@ -229,6 +320,27 @@ public String getProjectPath() {
         return "";
     }
 
+    public String getProjectLocName() {
+        if (resource != null) {
+            return resource.getProject().getRawLocation().toFile().getName();
+        }
+        return "";
+    }
+
+    public String getProjectLocPath() {
+        if (resource != null) {
+            return resource.getProject().getRawLocation().toFile().getName();
+        }
+        return "";
+    }
+
+    public String getProjectParentLoc() {
+        if (resource != null) {
+            return resource.getProject().getLocation().toFile().getParent().toString();
+        }
+        return "";
+    }
+
     public String getWorkspaceLocation() {
         if (resource != null) {
             return resource.getWorkspace().getRoot().getLocation().toFile().toString();

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

@@ -79,6 +79,33 @@ public String resolve(Object object, Object parameter) {
             return ((Resource)object).getResourcePath();
         };
     }),
+    // ${easyshell:resource_loc_path}
+    varResourceLocPath(true, false, "resource_loc_path", "relative location path of file or directory (to workspace)", new IVariableResolver() {
+        public String resolve(Object object, Object parameter) {
+            if(!(object instanceof Resource)) {
+                return "";
+            }
+            return ((Resource)object).getResourceLocPath();
+        };
+    }),
+    // ${easyshell:resource_project_path}
+    varResourceProjectPath(true, false, "resource_project_path", "relative path of file or directory (to project)", new IVariableResolver() {
+        public String resolve(Object object, Object parameter) {
+            if(!(object instanceof Resource)) {
+                return "";
+            }
+            return ((Resource)object).getResourceProjectPath();
+        };
+    }),
+    // ${easyshell:resource_project_loc_path}
+    varResourceProjectLocPath(true, false, "resource_project_loc_path", "relative location path of file or directory (to project)", new IVariableResolver() {
+        public String resolve(Object object, Object parameter) {
+            if(!(object instanceof Resource)) {
+                return "";
+            }
+            return ((Resource)object).getResourceProjectLocPath();
+        };
+    }),
     // ${easyshell:resource_line_number}
     varResourceLineNumber(true, false, "resource_line_number", "selected text line number", new IVariableResolver() {
       public String resolve(Object object, Object parameter) {
@@ -160,6 +187,33 @@ public String resolve(Object object, Object parameter) {
             return ((Resource)object).getContainerPath();
         };
     }),
+    // ${easyshell:container_loc_path}
+    varContainerLocPath(true, false, "container_loc_path", "relative location path of file's parent directory or directory itself (to workspace)", new IVariableResolver() {
+        public String resolve(Object object, Object parameter) {
+            if(!(object instanceof Resource)) {
+                return "";
+            }
+            return ((Resource)object).getContainerLocPath();
+        };
+    }),
+    // ${easyshell:container_project_path}
+    varContainerProjectPath(true, false, "container_project_path", "relative path of file's parent directory or directory itself (to project)", new IVariableResolver() {
+        public String resolve(Object object, Object parameter) {
+            if(!(object instanceof Resource)) {
+                return "";
+            }
+            return ((Resource)object).getContainerProjectPath();
+        };
+    }),
+    // ${easyshell:container_project_loc_path}
+    varContainerProjectLocPath(true, false, "container_project_loc_path", "relative location path of file's parent directory or directory itself (to project)", new IVariableResolver() {
+        public String resolve(Object object, Object parameter) {
+            if(!(object instanceof Resource)) {
+                return "";
+            }
+            return ((Resource)object).getContainerProjectLocPath();
+        };
+    }),
     // ${easyshell:parent_loc} for file it's equal to ${easyshell:container_loc}
     varParentLoc(true, false, "parent_loc", "absolute path of parent directory\n\nfor files it's equal to ${easyshell:container_loc}", new IVariableResolver() {
         public String resolve(Object object, Object parameter) {
@@ -187,6 +241,33 @@ public String resolve(Object object, Object parameter) {
             return ((Resource)object).getParentPath();
         };
     }),
+    // ${easyshell:parent_loc_path} for file it's equal to ${easyshell:container_loc_path}
+    varParentLocPath(true, false, "parent_loc_path", "relative location path of parent directory (to workspace)\n\nfor files it's equal to ${easyshell:container_loc_path}", new IVariableResolver() {
+        public String resolve(Object object, Object parameter) {
+            if(!(object instanceof Resource)) {
+                return "";
+            }
+            return ((Resource)object).getParentLocPath();
+        };
+    }),
+    // ${easyshell:parent_project_path} for file it's equal to ${easyshell:container_project_path}
+    varParentProjectPath(true, false, "parent_project_path", "relative path of parent directory (to project)\n\nfor files it's equal to ${easyshell:container_project_path}", new IVariableResolver() {
+        public String resolve(Object object, Object parameter) {
+            if(!(object instanceof Resource)) {
+                return "";
+            }
+            return ((Resource)object).getParentProjectPath();
+        };
+    }),
+    // ${easyshell:parent_project_loc_path} for file it's equal to ${easyshell:container_project_loc_path}
+    varParentProjectLocPath(true, false, "parent_project_loc_path", "relative location path of parent directory (to project)\n\nfor files it's equal to ${easyshell:container_project_loc_path}", new IVariableResolver() {
+        public String resolve(Object object, Object parameter) {
+            if(!(object instanceof Resource)) {
+                return "";
+            }
+            return ((Resource)object).getParentProjectLocPath();
+        };
+    }),
     // ${easyshell:project_loc}
     varProjectLoc(true, false, "project_loc", "absolute path of project", new IVariableResolver() {
         public String resolve(Object object, Object parameter) {
@@ -211,6 +292,32 @@ public String resolve(Object object, Object parameter) {
             return ((Resource)object).getProjectPath();
         };
     }),
+    // ${easyshell:project_loc_name} == {4}
+    varProjectLocName(true, false, "project_loc_name", "location name (folder) of project", new IVariableResolver() {
+        public String resolve(Object object, Object parameter) {
+            return ((Resource)object).getProjectLocName();
+        };
+    }),
+/*
+    // ${easyshell:project_loc_path}
+    varProjectLocPath(true, false, "project_loc_path", "relative location path of project (to workspace)", new IVariableResolver() {
+        public String resolve(Object object, Object parameter) {
+            if(!(object instanceof Resource)) {
+                return "";
+            }
+            return ((Resource)object).getProjectLocPath();
+        };
+    }),
+*/
+    // ${easyshell:project_parent_loc}
+    varProjectParentLoc(true, false, "project_parent_loc", "absolute path of project's parent", new IVariableResolver() {
+        public String resolve(Object object, Object parameter) {
+            if(!(object instanceof Resource)) {
+                return "";
+            }
+            return ((Resource)object).getProjectParentLoc();
+        };
+    }),
     // ${easyshell:workspace_loc}
     varWorkspaceLoc(true, false, "workspace_loc", "absolute path of workspace", new IVariableResolver() {
         public String resolve(Object object, Object parameter) {
@@ -222,14 +329,14 @@ public String resolve(Object object, Object parameter) {
     }),
 /*
     // ${easyshell:workspace_name}
-    varWorkspaceName(true, false, "workspace_name", "name of workspace (same as workspace_foldername if not configured)", new IVariableResolver() {
+    varWorkspaceName(true, false, "workspace_name", "name of workspace (same as workspace_loc_name if not configured)", new IVariableResolver() {
         public String resolve(Object object, Object parameter) {
             return ((Resource)object).getWorkspaceName();
         };
     }),
 */
     // ${easyshell:workspace_loc_name}
-    varWorkspaceLocName(true, false, "workspace_loc_name", "name of workspace's folder", new IVariableResolver() {
+    varWorkspaceLocName(true, false, "workspace_loc_name", "location name (folder) of workspace", new IVariableResolver() {
         public String resolve(Object object, Object parameter) {
             return ((Resource)object).getWorkspaceLocName();
         };