Commit c7f7c954 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Bug 735584 - Reached end of file while still insided a (nested) comment in Markdown

parent f9c9edba
...@@ -1011,7 +1011,7 @@ void convertCppComments(BufStr *inBuf,BufStr *outBuf,const char *fileName) ...@@ -1011,7 +1011,7 @@ void convertCppComments(BufStr *inBuf,BufStr *outBuf,const char *fileName)
warn(g_fileName,ctx->lineNr,"Conditional section%sdoes not have " warn(g_fileName,ctx->lineNr,"Conditional section%sdoes not have "
"a corresponding \\endcond command within this file.",sectionInfo.data()); "a corresponding \\endcond command within this file.",sectionInfo.data());
} }
if (g_nestingCount>0 || (YY_START==CComment && g_lang!=SrcLangExt_Markdown)) if (g_nestingCount>0 && g_lang!=SrcLangExt_Markdown)
{ {
QCString tmp= "(probable line reference: "; QCString tmp= "(probable line reference: ";
bool first = TRUE; bool first = TRUE;
......
...@@ -1044,11 +1044,11 @@ static void handleUnclosedStyleCommands() ...@@ -1044,11 +1044,11 @@ static void handleUnclosedStyleCommands()
} }
} }
static void handleLinkedWord(DocNode *parent,QList<DocNode> &children) static void handleLinkedWord(DocNode *parent,QList<DocNode> &children,bool ignoreAutoLinkFlag=FALSE)
{ {
QCString name = linkToText(SrcLangExt_Unknown,g_token->name,TRUE); QCString name = linkToText(SrcLangExt_Unknown,g_token->name,TRUE);
static bool autolinkSupport = Config_getBool("AUTOLINK_SUPPORT"); static bool autolinkSupport = Config_getBool("AUTOLINK_SUPPORT");
if (!autolinkSupport) // no autolinking -> add as normal word if (!autolinkSupport && !ignoreAutoLinkFlag) // no autolinking -> add as normal word
{ {
children.append(new DocWord(parent,name)); children.append(new DocWord(parent,name));
return; return;
...@@ -1130,7 +1130,7 @@ static void handleLinkedWord(DocNode *parent,QList<DocNode> &children) ...@@ -1130,7 +1130,7 @@ static void handleLinkedWord(DocNode *parent,QList<DocNode> &children)
// special case, where matching Foo: fails to be an Obj-C reference, // special case, where matching Foo: fails to be an Obj-C reference,
// but Foo itself might be linkable. // but Foo itself might be linkable.
g_token->name=g_token->name.left(len-1); g_token->name=g_token->name.left(len-1);
handleLinkedWord(parent,children); handleLinkedWord(parent,children,ignoreAutoLinkFlag);
children.append(new DocWord(parent,":")); children.append(new DocWord(parent,":"));
} }
else if (!g_insideHtmlLink && (cd=getClass(g_token->name+"-p"))) else if (!g_insideHtmlLink && (cd=getClass(g_token->name+"-p")))
...@@ -6113,7 +6113,7 @@ int DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &ta ...@@ -6113,7 +6113,7 @@ int DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &ta
bool inSeeBlock = g_inSeeBlock; bool inSeeBlock = g_inSeeBlock;
g_token->name = cref; g_token->name = cref;
g_inSeeBlock = TRUE; g_inSeeBlock = TRUE;
handleLinkedWord(this,m_children); handleLinkedWord(this,m_children,TRUE);
g_inSeeBlock = inSeeBlock; g_inSeeBlock = inSeeBlock;
} }
else // <see cref="...">...</see> style else // <see cref="...">...</see> style
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment