remove deprecated warnings, update spec for overwritten moonscript lexer

leafo · leafo · commit 3bf8b9793437 · 2020-04-25T22:55:35.000-07:00
diff --git a/spec/syntaxhighlight_spec.moon b/spec/syntaxhighlight_spec.moon
@@ -31,6 +31,10 @@ describe "syntaxhighlight", ->
       </span><span class="sh_operator">&lt;/</span><span class="sh_identifier">html</span><span class="sh_operator">&gt;</span><span class="sh_moonscript_whitespace sh_whitespace">
     </span></pre>]], out
 
+  it "highlights moonscript with custom changes", ->
+    out = assert require("syntaxhighlight").highlight_to_html "moonscript", [[{for: @}]]
+    assert.same [[<pre class="sh_highlight"><span class="sh_symbol sh_embedded">{</span><span class="sh_tbl_key sh_regex">for:</span><span class="sh_moonscript_whitespace sh_whitespace"> </span><span class="sh_self_ref sh_label">@</span><span class="sh_symbol sh_embedded">}</span></pre>]], out
+
   it "highlights html with css", ->
     out = assert require("syntaxhighlight").highlight_to_html "html", [[
       <!DOCTYPE HTML>
diff --git a/syntaxhighlight/lexers/moonscript.lua b/syntaxhighlight/lexers/moonscript.lua
@@ -120,8 +120,8 @@ local longstring = lpeg.Cmt('[' * lpeg.C(P('=')^0) * '[',
   end)
 
 -- Strings.
-local sq_str = lexer.range("'", false, false)
-local dq_str = lexer.range('"', false, false)
+local sq_str = lexer.range("'")
+local dq_str = lexer.range('"')
 lex:add_rule('string', token(lexer.STRING, sq_str + dq_str) +
   token('longstring', longstring))
 lex:add_style('longstring', lexer.STYLE_STRING)
diff --git a/syntaxhighlight/lexers/nginx.lua b/syntaxhighlight/lexers/nginx.lua
@@ -98,8 +98,8 @@ lex:add_style('library', lexer.STYLE_TYPE)
 
 lex:add_rule('variable', token(lexer.VARIABLE, '$' * (1 - lexer.space)^1))
 
-local sq_str = lexer.delimited_range("'", false, true)
-local dq_str = lexer.delimited_range('"', false, true)
+local sq_str = lexer.range("'")
+local dq_str = lexer.range('"')
 lex:add_rule('string', token(lexer.STRING, sq_str + dq_str))
 
 lex:add_rule('number', token(lexer.NUMBER, lexer.float + lexer.integer))
