diff options
| author | Stefan Seelmann | 2013-08-16 20:49:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2013-10-25 22:53:22 +0000 |
| commit | 5d59e70c3a80b34eea5e2118e7eb8daf8f3c5932 (patch) | |
| tree | 44a7be880e432a6f9cc5a48cb41ea7723d59897d /org.eclipse.mylyn.wikitext.markdown.core | |
| parent | fe0f0c6a99f03dcca4a820f18cfef60bd7f63ec5 (diff) | |
| download | org.eclipse.mylyn.docs-5d59e70c3a80b34eea5e2118e7eb8daf8f3c5932.tar.gz org.eclipse.mylyn.docs-5d59e70c3a80b34eea5e2118e7eb8daf8f3c5932.tar.xz org.eclipse.mylyn.docs-5d59e70c3a80b34eea5e2118e7eb8daf8f3c5932.zip | |
415101: Allow empty alt text, link text, and title.
Beside the main issue (empty alt text in images) now the parser
also accepts an empty title. Additional it also accepts empty
link text for links, this is not very useful but compatible to
other Markdown implementations. Fixed for both inline and
reference style images and links.
Change-Id: I3c720931389b823eca65dbbd5baf31406ab4a420
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=415101
Signed-off-by: Stefan Seelmann <mail@stefan-seelmann.de>
Diffstat (limited to 'org.eclipse.mylyn.wikitext.markdown.core')
5 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/LinkDefinitionParser.java b/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/LinkDefinitionParser.java index 679de4d84..ff2853e13 100644 --- a/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/LinkDefinitionParser.java +++ b/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/LinkDefinitionParser.java @@ -27,7 +27,7 @@ public class LinkDefinitionParser { private static final String URL_REGEX = "\\s+(?=[<]?(([^>\\s]+)))(?:<\\3>|\\3)"; //$NON-NLS-1$ - private static final String TITLE_REGEX = "(?:\\s+[\"'\\(](.+)[\"'\\)])?"; //$NON-NLS-1$ + private static final String TITLE_REGEX = "(?:\\s+[\"'\\(](.*?)[\"'\\)])?"; //$NON-NLS-1$ public static final Pattern LINK_DEFINITION_PATTERN = Pattern.compile(ID_REGEX + URL_REGEX + TITLE_REGEX); diff --git a/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/token/InlineImageReplacementToken.java b/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/token/InlineImageReplacementToken.java index 384f3a04f..74da07c3a 100644 --- a/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/token/InlineImageReplacementToken.java +++ b/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/token/InlineImageReplacementToken.java @@ -24,7 +24,7 @@ public class InlineImageReplacementToken extends PatternBasedElement { @Override protected String getPattern(int groupOffset) { - return "!\\[\\s*(.+?)\\s*\\]\\(\\s*(.+?)(?:\\s\"(.+?)\")?\\s*\\)"; //$NON-NLS-1$ + return "!\\[\\s*(.*?)\\s*\\]\\(\\s*(.+?)(?:\\s\"(.*?)\")?\\s*\\)"; //$NON-NLS-1$ } @Override diff --git a/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/token/InlineLinkReplacementToken.java b/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/token/InlineLinkReplacementToken.java index 3b33cba8d..f856fdc1e 100644 --- a/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/token/InlineLinkReplacementToken.java +++ b/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/token/InlineLinkReplacementToken.java @@ -24,7 +24,7 @@ public class InlineLinkReplacementToken extends PatternBasedElement { @Override protected String getPattern(int groupOffset) { - return "\\[\\s*(.+?)\\s*\\]\\(\\s*(.+?)(?:\\s\"(.+?)\")?\\s*\\)"; //$NON-NLS-1$ + return "\\[\\s*(.*?)\\s*\\]\\(\\s*(.+?)(?:\\s\"(.*?)\")?\\s*\\)"; //$NON-NLS-1$ } @Override diff --git a/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/token/ReferenceStyleImageReplacementToken.java b/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/token/ReferenceStyleImageReplacementToken.java index bd0cf0fff..db6eb24c3 100644 --- a/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/token/ReferenceStyleImageReplacementToken.java +++ b/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/token/ReferenceStyleImageReplacementToken.java @@ -26,7 +26,7 @@ public class ReferenceStyleImageReplacementToken extends PatternBasedElement { @Override protected String getPattern(int groupOffset) { - return "!(\\[\\s*(.+?)\\s*\\]\\s*\\[\\s*(.*?)\\s*\\])"; //$NON-NLS-1$ + return "!(\\[\\s*(.*?)\\s*\\]\\s*\\[\\s*(.*?)\\s*\\])"; //$NON-NLS-1$ } @Override diff --git a/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/token/ReferenceStyleLinkReplacementToken.java b/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/token/ReferenceStyleLinkReplacementToken.java index 793b1e91d..db650082f 100644 --- a/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/token/ReferenceStyleLinkReplacementToken.java +++ b/org.eclipse.mylyn.wikitext.markdown.core/src/org/eclipse/mylyn/internal/wikitext/markdown/core/token/ReferenceStyleLinkReplacementToken.java @@ -26,7 +26,7 @@ public class ReferenceStyleLinkReplacementToken extends PatternBasedElement { @Override protected String getPattern(int groupOffset) { - return "(\\[\\s*(.+?)\\s*\\]\\s*\\[\\s*(.*?)\\s*\\])"; //$NON-NLS-1$ + return "(\\[\\s*(.*?)\\s*\\]\\s*\\[\\s*(.*?)\\s*\\])"; //$NON-NLS-1$ } @Override |