Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix #675] Correct indentation for double-byte characters #676

Merged
merged 1 commit into from
Nov 9, 2019
Merged

[Fix #675] Correct indentation for double-byte characters #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/annotate/annotate_models.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,7 @@ def format_default(col_name, max_size, col_type, bare_type_allowance, attrs)
end

def width(string)
string.chars.inject(0) { |acc, elem| acc + (elem.bytesize == 1 ? 1 : 2) }
string.chars.inject(0) { |acc, elem| acc + (elem.bytesize == 3 ? 2 : 1) }
end

def mb_chars_ljust(string, length)
Expand Down
18 changes: 12 additions & 6 deletions spec/lib/annotate/annotate_models_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,9 @@ def self.when_called_with(options = {})
[:active, :boolean, { limit: 1, comment: 'ＡＣＴＩＶＥ' }],
[:name, :string, { limit: 50, comment: 'ＮＡＭＥ' }],
[:notes, :text, { limit: 55, comment: 'ＮＯＴＥＳ' }],
[:cyrillic, :text, { limit: 30, comment: 'Кириллица' }],
[:japanese, :text, { limit: 60, comment: '熊本大学　イタリア　宝島' }],
[:arabic, :text, { limit: 20, comment: 'لغة' }],
[:no_comment, :text, { limit: 20, comment: nil }],
[:location, :geometry_collection, { limit: nil, comment: nil }]
]
Expand All @@ -1017,12 +1020,15 @@ def self.when_called_with(options = {})
#
# Table name: users
#
# id(ＩＤ) :integer not null, primary key
# active(ＡＣＴＩＶＥ) :boolean not null
# name(ＮＡＭＥ) :string(50) not null
# notes(ＮＯＴＥＳ) :text(55) not null
# no_comment :text(20) not null
# location :geometry_collect not null
# id(ＩＤ) :integer not null, primary key
# active(ＡＣＴＩＶＥ) :boolean not null
# name(ＮＡＭＥ) :string(50) not null
# notes(ＮＯＴＥＳ) :text(55) not null
# cyrillic(Кириллица) :text(30) not null
# japanese(熊本大学　イタリア　宝島) :text(60) not null
# arabic(لغة) :text(20) not null
# no_comment :text(20) not null
# location :geometry_collect not null
#
EOS

Expand Down