Created
January 15, 2018 00:21
-
-
Save pkulchenko/d06ff523561dece69ea9f264dde8e5bf to your computer and use it in GitHub Desktop.
ZeroBrane Studio Editor patch to capture linecomment value
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/editor/editor.lua b/src/editor/editor.lua | |
index f92e7f1..5a90fa1 100644 | |
--- a/src/editor/editor.lua | |
+++ b/src/editor/editor.lua | |
@@ -1624,7 +1624,8 @@ local function cleanup(paths) | |
if not FileRemove(path) then wx.wxRmdir(path) end | |
end | |
end | |
-local function setLexLPegLexer(editor, lexername) | |
+local function setLexLPegLexer(editor, spec) | |
+ local lexername = spec.lexer | |
local lexer = lexername:gsub("^lexlpeg%.","") | |
local ppath = package.path | |
@@ -1701,7 +1702,12 @@ local function setLexLPegLexer(editor, lexername) | |
end | |
end | |
end | |
- return true, styleconvert | |
+ spec.lexerstyleconvert = styleconvert | |
+ -- assign line comment value based on the values in the lexer comment table | |
+ for k, v in pairs(lexmod._foldsymbols and lexmod._foldsymbols.comment or {}) do | |
+ if type(v) == 'function' then spec.linecomment = k end | |
+ end | |
+ return true | |
end | |
function SetupKeywords(editor, ext, forcespec, styles, font, fontitalic) | |
@@ -1710,12 +1716,10 @@ function SetupKeywords(editor, ext, forcespec, styles, font, fontitalic) | |
-- found a spec setup lexers and keywords | |
if spec then | |
if type(spec.lexer) == "string" then | |
- local ok, res = setLexLPegLexer(editor, spec.lexer) | |
- if ok then | |
- spec.lexerstyleconvert = res | |
- else | |
+ local ok, err = setLexLPegLexer(editor, spec) | |
+ if not ok then | |
spec.lexerstyleconvert = {} | |
- ide:Print(("Can't load LexLPeg '%s' lexer: %s"):format(spec.lexer, res)) | |
+ ide:Print(("Can't load LexLPeg '%s' lexer: %s"):format(spec.lexer, err)) | |
editor:SetLexer(wxstc.wxSTC_LEX_NULL) | |
end | |
UpdateSpecs(spec) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment