summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2019-10-19 12:25:46 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2019-10-19 12:25:46 +0000
commitadff3bcb7e6a2da835d0f1b43850077c6bc344b5 (patch)
treec80c38798a7a2a962afd3c9237e98ef2a52a230a
parent5e5712f82d8c01a03af8f40a604bba6e57b8cac9 (diff)
downloadredmine-adff3bcb7e6a2da835d0f1b43850077c6bc344b5.tar.gz
redmine-adff3bcb7e6a2da835d0f1b43850077c6bc344b5.zip
code cleanup: rubocop: fix Layout/CommentIndentation in lib/redmine/wiki_formatting/textile/redcloth3.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@18773 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--.rubocop_todo.yml1
-rw-r--r--lib/redmine/wiki_formatting/textile/redcloth3.rb40
2 files changed, 20 insertions, 21 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 8d625a840..8c153bdc8 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -87,7 +87,6 @@ Layout/ClosingParenthesisIndentation:
# Cop supports --auto-correct.
Layout/CommentIndentation:
Exclude:
- - 'lib/redmine/wiki_formatting/textile/redcloth3.rb'
- 'test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb'
# Cop supports --auto-correct.
diff --git a/lib/redmine/wiki_formatting/textile/redcloth3.rb b/lib/redmine/wiki_formatting/textile/redcloth3.rb
index 064045c1f..10959bf01 100644
--- a/lib/redmine/wiki_formatting/textile/redcloth3.rb
+++ b/lib/redmine/wiki_formatting/textile/redcloth3.rb
@@ -399,26 +399,26 @@ class RedCloth3 < String
# Elements to handle
GLYPHS = [
- # [ /([^\s\[{(>])?\'([dmst]\b|ll\b|ve\b|\s|:|$)/, '\1&#8217;\2' ], # single closing
- # [ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)\'/, '\1&#8217;' ], # single closing
- # [ /\'(?=[#{PUNCT_Q}]*(s\b|[\s#{PUNCT_NOQ}]))/, '&#8217;' ], # single closing
- # [ /\'/, '&#8216;' ], # single opening
- # [ /</, '&lt;' ], # less-than
- # [ />/, '&gt;' ], # greater-than
- # [ /([^\s\[{(])?"(\s|:|$)/, '\1&#8221;\2' ], # double closing
- # [ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)"/, '\1&#8221;' ], # double closing
- # [ /"(?=[#{PUNCT_Q}]*[\s#{PUNCT_NOQ}])/, '&#8221;' ], # double closing
- # [ /"/, '&#8220;' ], # double opening
- # [ /\b( )?\.{3}/, '\1&#8230;' ], # ellipsis
- # [ /\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])/, '<acronym title="\2">\1</acronym>' ], # 3+ uppercase acronym
- # [ /(^|[^"][>\s])([A-Z][A-Z0-9 ]+[A-Z0-9])([^<A-Za-z0-9]|$)/, '\1<span class="caps">\2</span>\3', :no_span_caps ], # 3+ uppercase caps
- # [ /(\.\s)?\s?--\s?/, '\1&#8212;' ], # em dash
- # [ /\s->\s/, ' &rarr; ' ], # right arrow
- # [ /\s-\s/, ' &#8211; ' ], # en dash
- # [ /(\d+) ?x ?(\d+)/, '\1&#215;\2' ], # dimension sign
- # [ /\b ?[(\[]TM[\])]/i, '&#8482;' ], # trademark
- # [ /\b ?[(\[]R[\])]/i, '&#174;' ], # registered
- # [ /\b ?[(\[]C[\])]/i, '&#169;' ] # copyright
+ # [ /([^\s\[{(>])?\'([dmst]\b|ll\b|ve\b|\s|:|$)/, '\1&#8217;\2' ], # single closing
+ # [ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)\'/, '\1&#8217;' ], # single closing
+ # [ /\'(?=[#{PUNCT_Q}]*(s\b|[\s#{PUNCT_NOQ}]))/, '&#8217;' ], # single closing
+ # [ /\'/, '&#8216;' ], # single opening
+ # [ /</, '&lt;' ], # less-than
+ # [ />/, '&gt;' ], # greater-than
+ # [ /([^\s\[{(])?"(\s|:|$)/, '\1&#8221;\2' ], # double closing
+ # [ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)"/, '\1&#8221;' ], # double closing
+ # [ /"(?=[#{PUNCT_Q}]*[\s#{PUNCT_NOQ}])/, '&#8221;' ], # double closing
+ # [ /"/, '&#8220;' ], # double opening
+ # [ /\b( )?\.{3}/, '\1&#8230;' ], # ellipsis
+ # [ /\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])/, '<acronym title="\2">\1</acronym>' ], # 3+ uppercase acronym
+ # [ /(^|[^"][>\s])([A-Z][A-Z0-9 ]+[A-Z0-9])([^<A-Za-z0-9]|$)/, '\1<span class="caps">\2</span>\3', :no_span_caps ], # 3+ uppercase caps
+ # [ /(\.\s)?\s?--\s?/, '\1&#8212;' ], # em dash
+ # [ /\s->\s/, ' &rarr; ' ], # right arrow
+ # [ /\s-\s/, ' &#8211; ' ], # en dash
+ # [ /(\d+) ?x ?(\d+)/, '\1&#215;\2' ], # dimension sign
+ # [ /\b ?[(\[]TM[\])]/i, '&#8482;' ], # trademark
+ # [ /\b ?[(\[]R[\])]/i, '&#174;' ], # registered
+ # [ /\b ?[(\[]C[\])]/i, '&#169;' ] # copyright
]
H_ALGN_VALS = {