From 9fc7d1f66ed33a3b95871de3a5f3af2486f22861 Mon Sep 17 00:00:00 2001
From: Alexandros Naskos <alex_naskos@hotmail.com>
Date: Fri, 15 May 2020 13:15:10 +0300
Subject: [PATCH 1/2] Maintain case when making a URI from a file, make drive
 letter lowercase on windows

---
 src/uri.zig | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/uri.zig b/src/uri.zig
index e1ad483..a331cb3 100644
--- a/src/uri.zig
+++ b/src/uri.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 
-const reserved_chars = &[_]u8 {
+const reserved_chars = &[_]u8{
     '!', '#', '$', '%', '&', '\'',
     '(', ')', '*', '+', ',', ':',
     ';', '=', '?', '@', '[', ']',
@@ -24,7 +24,17 @@ pub fn fromPath(allocator: *std.mem.Allocator, path: []const u8) ![]const u8 {
             try buf.append('%');
             try std.fmt.format(out_stream, "{X}", .{char});
         } else {
-            try buf.append(std.ascii.toLower(char));
+            try buf.append(char);
+        }
+    }
+
+    // On windows, we need to lowercase the drive name.
+    if (std.builtin.os.tag == .windows) {
+        if (buf.items.len > prefix.len + 1 and
+            std.ascii.isAlpha(buf.items[prefix.len]) and
+            std.mem.startsWith(u8, buf.items[prefix.len + 1 ..], "%3A"))
+        {
+            buf.items[prefix.len] = std.ascii.toLower(buf.items[prefix.len]);
         }
     }
 
@@ -33,7 +43,7 @@ pub fn fromPath(allocator: *std.mem.Allocator, path: []const u8) ![]const u8 {
 
 // Original code: https://github.com/andersfr/zig-lsp/blob/master/uri.zig
 fn parseHex(c: u8) !u8 {
-    return switch(c) {
+    return switch (c) {
         '0'...'9' => c - '0',
         'a'...'f' => c - 'a' + 10,
         'A'...'F' => c - 'A' + 10,
@@ -65,7 +75,7 @@ pub fn parse(allocator: *std.mem.Allocator, str: []const u8) ![]u8 {
             j += 1;
         }
     }
-    
+
     // Remove trailing separator
     if (i > 0 and uri[i - 1] == std.fs.path.sep) {
         i -= 1;

From 18a0ffc7e28b1269575cd7d815aad37af1a5c3ba Mon Sep 17 00:00:00 2001
From: Alexandros Naskos <alex_naskos@hotmail.com>
Date: Fri, 15 May 2020 13:21:34 +0300
Subject: [PATCH 2/2] Check that the zg std library path provided is absolute,
 default to null otherwise

---
 src/main.zig | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main.zig b/src/main.zig
index c08048a..0c0afe7 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -634,7 +634,12 @@ pub fn main() anyerror!void {
     }
     defer std.json.parseFree(Config, config, config_parse_options);
 
-    // @TODO Check is_absolute
+    if (config.zig_lib_path != null and !std.fs.path.isAbsolute(config.zig_lib_path.?)) {
+        std.debug.warn("zig library path is not absolute, defaulting to null.\n", .{});
+        allocator.free(config.zig_lib_path.?);
+        config.zig_lib_path = null;
+    }
+
     try document_store.init(allocator, config.zig_lib_path);
     defer document_store.deinit();