fix CJK characters width in output by sophgn · Pull Request #1378 · pre-commit/pre-commit

sophgn · 2020-03-27T09:40:34Z

No description provided.

asottile

could you add a test for this? there are other tests here:

Lines 37 to 90 in 528c7af

    
           def test_start_msg(): 
        
               ret = _start_msg(start='start', end_len=5, cols=15) 
        
               # 4 dots: 15 - 5 - 5 - 1 
        
               assert ret == 'start....' 
        
           def test_full_msg(): 
        
               ret = _full_msg( 
        
                   start='start', 
        
                   end_msg='end', 
        
                   end_color='', 
        
                   use_color=False, 
        
                   cols=15, 
        
               ) 
        
               # 6 dots: 15 - 5 - 3 - 1 
        
               assert ret == 'start......end\n' 
        
           def test_full_msg_with_color(): 
        
               ret = _full_msg( 
        
                   start='start', 
        
                   end_msg='end', 
        
                   end_color=color.RED, 
        
                   use_color=True, 
        
                   cols=15, 
        
               ) 
        
               # 6 dots: 15 - 5 - 3 - 1 
        
               assert ret == f'start......{color.RED}end{color.NORMAL}\n' 
        
           def test_full_msg_with_postfix(): 
        
               ret = _full_msg( 
        
                   start='start', 
        
                   postfix='post ', 
        
                   end_msg='end', 
        
                   end_color='', 
        
                   use_color=False, 
        
                   cols=20, 
        
               ) 
        
               # 6 dots: 20 - 5 - 5 - 3 - 1 
        
               assert ret == 'start......post end\n' 
        
           def test_full_msg_postfix_not_colored(): 
        
               ret = _full_msg( 
        
                   start='start', 
        
                   postfix='post ', 
        
                   end_msg='end', 
        
                   end_color=color.RED, 
        
                   use_color=True, 
        
                   cols=20, 
        
               ) 
        
               # 6 dots: 20 - 5 - 5 - 3 - 1 
        
               assert ret == f'start......post {color.RED}end{color.NORMAL}\n'

another note since I've been looking into the same thing for a text editor, east_asian_width doesn't necessarily indicate how wide the rendered character is, just what that attribute is. there are some characters which on most terminal emulators render wide without having F/W and some which render narrow while having F/W. then there are some terminal emulators which render it differently than other terminal emulators. (there's also zero-width characters to consider as well!)

I'm ok adding this anyway as-is, just that it's still not perfect for all users / characters / use cases (but I agree it's an improvement)

lastly, please continue working in this PR, don't make a new one like the last two -- it's ok to not have everything right in the first push :)

asottile

asottile reviewed Mar 27, 2020

View reviewed changes

Comment thread pre_commit/commands/run.py Outdated

Comment thread pre_commit/commands/run.py Outdated

asottile reviewed Mar 28, 2020

View reviewed changes

Comment thread pre_commit/commands/run.py Outdated

asottile approved these changes Mar 28, 2020

View reviewed changes

fix CJK characters width in output

605b39f

asottile force-pushed the master branch from c54ac60 to 605b39f Compare March 28, 2020 15:07

asottile merged commit 34e9d11 into pre-commit:master Mar 28, 2020

Navigation Menu

Uh oh!

Uh oh!

fix CJK characters width in output - #1378

fix CJK characters width in output#1378
asottile merged 1 commit into
pre-commit:masterfrom
sophgn:master

sophgn commented Mar 27, 2020

Uh oh!

asottile left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

asottile left a comment

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

2 participants

	def test_start_msg():
	ret = _start_msg(start='start', end_len=5, cols=15)
	# 4 dots: 15 - 5 - 5 - 1
	assert ret == 'start....'


	def test_full_msg():
	ret = _full_msg(
	start='start',
	end_msg='end',
	end_color='',
	use_color=False,
	cols=15,
	)
	# 6 dots: 15 - 5 - 3 - 1
	assert ret == 'start......end\n'


	def test_full_msg_with_color():
	ret = _full_msg(
	start='start',
	end_msg='end',
	end_color=color.RED,
	use_color=True,
	cols=15,
	)
	# 6 dots: 15 - 5 - 3 - 1
	assert ret == f'start......{color.RED}end{color.NORMAL}\n'


	def test_full_msg_with_postfix():
	ret = _full_msg(
	start='start',
	postfix='post ',
	end_msg='end',
	end_color='',
	use_color=False,
	cols=20,
	)
	# 6 dots: 20 - 5 - 5 - 3 - 1
	assert ret == 'start......post end\n'


	def test_full_msg_postfix_not_colored():
	ret = _full_msg(
	start='start',
	postfix='post ',
	end_msg='end',
	end_color=color.RED,
	use_color=True,
	cols=20,
	)
	# 6 dots: 20 - 5 - 5 - 3 - 1
	assert ret == f'start......post {color.RED}end{color.NORMAL}\n'

Uh oh!

Uh oh!

Conversation

sophgn commented Mar 27, 2020

Uh oh!

asottile left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

asottile left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

2 participants