Merge pull request #11 from jbeker/master

Passes relative path to rubocop
jsmecham · Sep 17, 2020 · 4fb95cc · 4fb95cc
2 parents e994140 + 7aaa27a
commit 4fb95cc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/Source/Scripts/Linter.js b/Source/Scripts/Linter.js
@@ -20,7 +20,7 @@ class Linter {
         const contentRange = new Range(0, document.length);
         const content = document.getTextInRange(contentRange);
 
-        return this.lintString(content, document.uri);
+        return this.lintString(content, document.path);
     }
 
     async lintString(string, uri) {

diff --git a/Source/Scripts/RuboCopProcess.js b/Source/Scripts/RuboCopProcess.js
@@ -91,13 +91,21 @@ class RuboCopProcess {
     }
 
     async execute(content, uri) {
+        let workspaceOverlap = uri.indexOf(nova.workspace.path);
+        let relativePath = '';
+
+        if (workspaceOverlap != -1) {
+            relativePath = uri.substring(workspaceOverlap + nova.workspace.path.length + 1);
+        } else {
+            relativePath = uri;
+        }
+
         const defaultArguments = [
             "rubocop",
             "--format=json",
             "--stdin",
-            uri
+            relativePath
         ];
-
         const process = await this.process(defaultArguments);
         if (!process) return;