Replace strcharpart() with substitute() for backward compatibility #834
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PhilRunninger
requested changes
Apr 26, 2018
There was a problem hiding this comment.
Resolve the conflicts, and I'll merge this. We don't need the if exists("*strcharpart") block introduced in #833 anymore, but your changes here don't account for its removal.
lib/nerdtree/bookmark.vim
Outdated
| @@ -288,7 +288,7 @@ function! s:Bookmark.str() | |||
| let pathStr = self.path.str({'format': 'UI'}) | |||
| if strdisplaywidth(pathStr) > pathStrMaxLen | |||
| while strdisplaywidth(pathStr) > pathStrMaxLen && strchars(pathStr) > 0 | |||
| let pathStr = strcharpart(pathStr, 1) | |||
| let pathStr = substitute(pathStr, '.\{1}', '', '') | |||
There was a problem hiding this comment.
I think the regex '^.' would be safer to use here. That guarantees it finds the first character.
lib/nerdtree/path.vim
Outdated
| @@ -721,7 +721,7 @@ function! s:Path.str(...) | |||
| let limit = options['truncateTo'] | |||
| if strdisplaywidth(toReturn) > limit-1 | |||
| while strdisplaywidth(toReturn) > limit-1 && strchars(toReturn) > 0 | |||
| let toReturn = strcharpart(toReturn, 1) | |||
| let toReturn = substitute(toReturn, '.\{1}', '', '') | |||
PhilRunninger
approved these changes
Apr 26, 2018
|
I have commit this change to the branch used in #830, but the branch didn't sync to the master branch, so I did't mention the removal of |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request #833 has supplied a fix to workaround the backward compatibility problem in #830. But the multi-byte path problem will appear again in the older version of vim before the function strcharpart was introduced. We can use substitute to achieve the same result as when strcharpart is used.