Merge pull request #895 from julia-vscode/valid-utf-check

Add a check for strings with NULL

Author: davidanthoff

src/document.jl

@@ -37,6 +37,8 @@ function get_text(doc::Document)
 end
 
 function set_text!(doc::Document, text)
+    # TODO Remove this check eventually
+    occursin('\0', text) && throw(LSInvalidFile("Tried to set a text with an embedded NULL as the document content."))
     doc._content = text
     doc._line_offsets = nothing
     doc._line_offsets2 = nothing
@@ -127,7 +129,7 @@ function get_offset2(doc::Document, line::Integer, character::Integer)
         pos = nextind(text, pos)
     end
 
-    return pos
+return pos
 end
 
 # Note: to be removed
@@ -166,7 +168,7 @@ function get_line_offsets(doc::Document, force=false)
         doc._line_offsets = Int[0]
         text = get_text(doc)
         ind = firstindex(text)
-        while ind <= lastindex(text)
+            while ind <= lastindex(text)
             c = text[ind]
             nl = c == '\n' || c == '\r'
             if c == '\r' && ind + 1 <= lastindex(text) && text[ind + 1] == '\n'
@@ -175,7 +177,7 @@ function get_line_offsets(doc::Document, force=false)
             nl && push!(doc._line_offsets, ind)
             ind = nextind(text, ind)
         end
-    end
+end
     return doc._line_offsets
 end
 
@@ -184,7 +186,7 @@ function get_line_offsets2!(doc::Document, force=false)
         doc._line_offsets2 = Int[1]
         text = get_text(doc)
         ind = firstindex(text)
-        while ind <= lastindex(text)
+            while ind <= lastindex(text)
             c = text[ind]
             if c == '\n' || c == '\r'
                 if c == '\r' && ind + 1 <= lastindex(text) && text[ind + 1] == '\n'
@@ -212,7 +214,7 @@ function get_line_of(line_offsets::Vector{Int}, offset::Integer)
             end
             line += 1
         end
-    end
+end
     return line, line_offsets[line]
 end
 
@@ -233,7 +235,7 @@ function get_position_at(doc::Document, offset::Integer)
         c = read(io, Char)
         character += 1
         if UInt32(c) >= 0x010000
-            character += 1
+    character += 1
         end
     end
     close(io)

src/exception_types.jl

@@ -60,4 +60,12 @@ end
 
 function Base.showerror(io::IO, ex::LSInfiniteLoop)
     print(io, ex.msg)
-end
+end
+
+struct LSInvalidFile <: Exception
+    msg::AbstractString
+end
+
+function Base.showerror(io::IO, ex::LSInvalidFile)
+    print(io, ex.msg)
+end