Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
annotate
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open-source
annotate
Commits
17aba6f4
Commit
17aba6f4
authored
Dec 10, 2015
by
B
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
allow frozen string literal magic comments
parent
695d0dd6
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
annotate_models.rb
lib/annotate/annotate_models.rb
+5
-5
No files found.
lib/annotate/annotate_models.rb
View file @
17aba6f4
...
...
@@ -330,8 +330,8 @@ module AnnotateModels
old_columns
=
old_header
&&
old_header
.
scan
(
column_pattern
).
sort
new_columns
=
new_header
&&
new_header
.
scan
(
column_pattern
).
sort
encoding
=
Regexp
.
new
(
/(^#\s*encoding:.*\n)|(^# coding:.*\n)|(^# -\*- coding:.*\n)|(^# -\*- encoding\s?:.*
\n)/
)
encoding_header
=
old_content
.
match
(
encoding
).
to_s
magic_comment_matcher
=
Regexp
.
new
(
/(^#\s*encoding:.*\n)|(^# coding:.*\n)|(^# -\*- coding:.*\n)|(^# -\*- encoding\s?:.*\n)|(^#\s*frozen_string_literal:.+
\n)/
)
magic_comments
=
old_content
.
scan
(
magic_comment_matcher
).
flatten
.
compact
if
old_columns
==
new_columns
&&
!
options
[
:force
]
return
false
...
...
@@ -349,12 +349,12 @@ module AnnotateModels
# if there *was* no old schema info (no substitution happened) or :force was passed,
# we simply need to insert it in correct position
if
new_content
==
old_content
||
options
[
:force
]
old_content
.
sub!
(
encoding
,
''
)
old_content
.
sub!
(
magic_comment_matcher
,
''
)
old_content
.
sub!
(
PATTERN
,
''
)
new_content
=
%w(after bottom)
.
include?
(
options
[
position
].
to_s
)
?
(
encoding_header
+
(
old_content
.
rstrip
+
"
\n\n
"
+
wrapped_info_block
))
:
(
encoding_header
+
wrapped_info_block
+
"
\n
"
+
old_content
)
(
magic_comments
.
join
+
(
old_content
.
rstrip
+
"
\n\n
"
+
wrapped_info_block
))
:
(
magic_comments
.
join
+
wrapped_info_block
+
"
\n
"
+
old_content
)
end
File
.
open
(
file_name
,
"wb"
)
{
|
f
|
f
.
puts
new_content
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment