Merge pull request #125 from takemikami/bugfix-win-lsp

bugfix: Windows Language Server path problem
imas · Apr 27, 2020 · d3ad017 · d3ad017
2 parents bdfb6d5 + 29abe8f
commit d3ad017
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/main/java/com/github/imas/rdflint/RdfLintLanguageServer.java b/src/main/java/com/github/imas/rdflint/RdfLintLanguageServer.java
@@ -69,7 +69,7 @@ public static String convertUri2FilePath(String uri) {
         // pass
       }
       return decoded;
-    }).collect(Collectors.joining(fileSeparator));
+    }).collect(Collectors.joining(File.separator));
     if (fullPath.split(fileSeparator)[1].endsWith(":")) {
       fullPath = fullPath.substring(1);
     }
@@ -226,6 +226,9 @@ void refreshFileTripleSet() {
                 if (File.separatorChar == '\\') {
                   subdir = filename.replaceAll("\\\\", "/");
                 }
+                if (subdir.length() > 0 && subdir.charAt(0) == '/' && baseUri.endsWith("/")) {
+                  subdir = subdir.substring(1);
+                }
                 Lang lang = e.toString().endsWith(".ttl") ? Lang.TURTLE : Lang.RDFXML;
                 String text = sourceTextMap.get(convertFilePath2Uri(e.toString()));
                 List<Triple> lst;

diff --git a/vscode-rdflint/CHANGELOG.md b/vscode-rdflint/CHANGELOG.md
@@ -6,6 +6,8 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 
 ## [Unreleased]
 
+## 0.1.4
+
 - Language Server Protocol enable/disable configuration.
 
 ## 0.0.4

diff --git a/vscode-rdflint/package-lock.json b/vscode-rdflint/package-lock.json