Skip to content

Replace strcharpart() with substitute() for backward compatibility #834

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

Merged
PhilRunninger merged 2 commits into from
Apr 26, 2018
Merged

Replace strcharpart() with substitute() for backward compatibility #834

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b45f2c2
Replace strcharpart() with substitute() for backward compatibility
Apr 26, 2018
abf2003
Merge branch 'master' into fix-multibyte-path
bravestarr Apr 26, 2018
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/nerdtree/bookmark.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}', '', '')
Copy link
Member

@PhilRunninger PhilRunninger Apr 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the regex '^.' would be safer to use here. That guarantees it finds the first character.

endwhile
let pathStr = '<' . pathStr
endif
Expand Down
2 changes: 1 addition & 1 deletion lib/nerdtree/path.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}', '', '')
Copy link
Member

@PhilRunninger PhilRunninger Apr 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same regex comment here.

endwhile
if len(split(toReturn, '/')) > 1
let toReturn = '</' . join(split(toReturn, '/')[1:], '/') . '/'
Expand Down