Merge pull request #42 from 1c-syntax/fix/plus-comma-circumflex

Fix URI handling by encoding special characters: `+`, `,` and `^`.

Author: nixel2007

src/main/java/com/github/_1c_syntax/utils/Absolute.java

@@ -48,7 +48,7 @@ public final class Absolute {
    */
   public static URI uri(@NonNull String uri) {
     try {
-      var url = new URL(uri);
+      var url = new URL(uri.replace("+", "%2B"));
       var decodedPath = URLDecoder.decode(url.getPath(), StandardCharsets.UTF_8);
       var decodedUri = new URI(
         url.getProtocol(),
@@ -133,6 +133,8 @@ private static String encodePath(@NonNull String path) {
     return path
       .replace(" ", "%20")
       .replace("#", "%23")
+      .replace("+", "%2B")
+      .replace(",", "%2C")
       .replace("[", "%91")
       .replace("]", "%93")
       .replace("?", "%3F")
@@ -141,6 +143,7 @@ private static String encodePath(@NonNull String path) {
       .replace(":", "%3A")
       .replace("\"", "%22")
       .replace("\\", "%5C")
+      .replace("^", "%5E")
       ;
   }
 

src/test/java/com/github/_1c_syntax/utils/AbsoluteTest.java

@@ -79,6 +79,55 @@ void testUNCURI() {
     ;
   }
 
+  @Test
+  void testStringWithPlus() {
+    // given
+    var uriString = "file:///git/some+thing.os";
+
+    // when
+    var uri = Absolute.uri(uriString);
+
+    // then
+    assertThat(uri)
+      .hasScheme("file");
+
+    assertThat(uri.getPath())
+      .endsWith("some+thing.os");
+  }
+
+  @Test
+  void testEscapedSymbols() {
+    // given
+    var uriString = "file:///git/1_Тест-Набор.Со+Странным^Именем_1,.os";
+
+    // when
+    var uri = Absolute.uri(uriString);
+
+    // then
+    assertThat(uri)
+      .hasScheme("file");
+
+    assertThat(uri.getPath())
+      .endsWith("1_Тест-Набор.Со+Странным^Именем_1,.os");
+  }
+
+  @Test
+  void testEscapedSymbolsURI() {
+    // given
+    var file = new File("/git/1_Тест-Набор.Со+Странным^Именем_1,.os");
+    var uriFromFile = file.toURI();
+
+    // when
+    var uri = Absolute.uri(uriFromFile);
+
+    // then
+    assertThat(uri)
+      .hasScheme("file");
+
+    assertThat(uri.getPath())
+      .endsWith("1_Тест-Набор.Со+Странным^Именем_1,.os");
+  }
+
   @Test
   void testUNCWithPortURI() {
     // given