jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Highlight Nim default in Markdown code in .nim (#20110)

Browse source 
Highlight Nim by default in Markdown code in .nim
This commit is contained in:
Andrey Makarov 2022-07-31 16:38:00 +03:00 • committed by GitHub
commit 40e0048a50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/packages/docutils/rst.nim
View file

@ -1688,6 +1688,18 @@ proc mayLoadFile(p: RstParser, result: var PRstNode) =
n.add newLeaf(readFile(path))
result.sons[2] = n
proc defaultCodeLangNim(p: RstParser, result: var PRstNode) =
# Create a field block if the input block didn't have any.
if result.sons[1].isNil: result.sons[1] = newRstNode(rnFieldList)
assert result.sons[1].kind == rnFieldList
# Hook the extra field and specify the Nim language as value.
var extraNode = newRstNode(rnField, info=lineInfo(p))
extraNode.add(newRstNode(rnFieldName))
extraNode.add(newRstNode(rnFieldBody))
extraNode.sons[0].add newLeaf("default-language")
extraNode.sons[1].add newLeaf("Nim")
result.sons[1].add(extraNode)
proc parseMarkdownCodeblock(p: var RstParser): PRstNode =
result = newRstNodeA(p, rnCodeBlock)
result.sons.setLen(3)
@ -1731,6 +1743,8 @@ proc parseMarkdownCodeblock(p: var RstParser): PRstNode =
var lb = newRstNode(rnLiteralBlock)
lb.add(n)
result.sons[2] = lb
if result.sons[0].isNil and roNimFile in p.s.options:
defaultCodeLangNim(p, result)
proc parseMarkdownLink(p: var RstParser; father: PRstNode): bool =
var desc, link = ""
@ -3227,16 +3241,7 @@ proc dirCodeBlock(p: var RstParser, nimExtension = false): PRstNode =
# Extend the field block if we are using our custom Nim extension.
if nimExtension:
# Create a field block if the input block didn't have any.
if result.sons[1].isNil: result.sons[1] = newRstNode(rnFieldList)
assert result.sons[1].kind == rnFieldList
# Hook the extra field and specify the Nim language as value.
var extraNode = newRstNode(rnField, info=lineInfo(p))
extraNode.add(newRstNode(rnFieldName))
extraNode.add(newRstNode(rnFieldBody))
extraNode.sons[0].add newLeaf("default-language")
extraNode.sons[1].add newLeaf("Nim")
result.sons[1].add(extraNode)
defaultCodeLangNim(p, result)
proc dirContainer(p: var RstParser): PRstNode =
result = parseDirective(p, rnContainer, {hasArg}, parseSectionWrapper)

2
lib/packages/docutils/rstgen.nim
View file

@ -1074,7 +1074,7 @@ proc renderCode(d: PDoc, n: PRstNode, result: var string) =
blockEnd = "}"
dispA(d.target, result, blockStart, blockStart, [])
if params.lang == langNone:
if len(params.langStr) > 0:
if len(params.langStr) > 0 and params.langStr.toLowerAscii != "none":
rstMessage(d.filenames, d.msgHandler, n.info, mwUnsupportedLanguage,
params.langStr)
for letter in m.text: escChar(d.target, result, letter, emText)