这是indexloc提供的服务，不要输入任何密码
Skip to content

Detect Darwin with lighter method #135

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
merged 2 commits into from
Feb 8, 2016
Merged

Detect Darwin with lighter method #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
467ae8e
Detect Darwin with lighter method
Dec 22, 2015
46a928b
Add readme for `g:WebDevIconsOS`
Feb 7, 2016
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
33 changes: 31 additions & 2 deletions plugin/webdevicons.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
" License: see LICENSE

let s:version = '0.7.1'
let s:operatingsystem = system("uname -s")

" standard fix/safety: line continuation (avoiding side effects) {{{1
"========================================================================
Expand Down Expand Up @@ -137,6 +136,36 @@ endif
" local functions {{{2
"========================================================================

" scope: local
function s:isDarwin()
if exists('s:is_darwin')
return s:is_darwin
endif

if exists('g:WebDevIconsOS')
let s:is_darwin = g:WebDevIconsOS ==? 'Darwin'
return s:is_darwin
endif

if has('macunix')
let s:is_darwin = 1
return s:is_darwin
endif

if ! has('unix')
let s:is_darwin = 0
return s:is_darwin
endif

if system('uname -s') ==# "Darwin\n"
let s:is_darwin = 1
else
let s:is_darwin = 0
endif

return s:is_darwin
endfunction

" scope: local
function! s:strip(input)
return substitute(a:input, '^\s*\(.\{-}\)\s*$', '\1', '')
Expand Down Expand Up @@ -534,7 +563,7 @@ function! WebDevIconsGetFileFormatSymbol(...)
if &fileformat == "dos"
let fileformat = ""
elseif &fileformat == "unix"
if s:operatingsystem == "Darwin\n"
if s:isDarwin()
let fileformat = ""
else
let fileformat = ""
Expand Down
6 changes: 6 additions & 0 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,12 @@ let g:WebDevIconsUnicodeDecorateFileNodesExtensionSymbols = {} " needed
let g:WebDevIconsUnicodeDecorateFileNodesExtensionSymbols['myext'] = 'ƛ'
```

* specify OS to decide an icon for unix fileformat (_not_ defined by default)
- this is useful for avoiding unnecessary `system()` call. you might see [#135](https://github.com/ryanoasis/vim-devicons/pull/135) to know logic further.
```vim
let g:WebDevIconsOS = 'Darwin'
```

## Lightline Setup

To add the appropriate icon to [lightline](https://github.com/itchyny/lightline.vim), call the function `WebDevIconsGetFileTypeSymbol()` and/or `WebDevIconsGetFileFormatSymbol()` in your `.vimrc`. For example, you could set your sections to:
Expand Down