Skip to content

Commit ff0ede6

Browse files
amixamix
committed
Merge branch 'master' of github.com:amix/vimrc
2 parents 01890d8 + d8d4f89 commit ff0ede6

File tree

19 files changed

+1125
-202
lines changed

19 files changed

+1125
-202
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ I recommend reading the docs of these plugins to understand them better. Each pl
9090
* [ack.vim](https://github.com/mileszs/ack.vim): Vim plugin for `the_silver_searcher` (ag) or ack -- a wicked fast grep
9191
* [bufexplorer.zip](https://github.com/vim-scripts/bufexplorer.zip): Quickly and easily switch between buffers. This plugin can be opened with `<leader+o>`
9292
* [ctrlp.vim](https://github.com/ctrlpvim/ctrlp.vim): Fuzzy file, buffer, mru and tag finder. It's mapped to `<Ctrl+F>`
93+
* [comfortable-motion.vim](https://github.com/yuttie/comfortable-motion.vim): Brings physics-based smooth scrolling to the Vim world!
9394
* [goyo.vim](https://github.com/junegunn/goyo.vim) and [vim-zenroom2](https://github.com/amix/vim-zenroom2):
9495
* [lightline.vim](https://github.com/itchyny/lightline.vim): A light and configurable statusline/tabline for Vim
9596
* [NERD Tree](https://github.com/scrooloose/nerdtree): A tree explorer plugin for vim

‎sources_non_forked/rust.vim/LICENSE-APACHE

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

‎sources_non_forked/rust.vim/LICENSE-MIT

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
Copyright (c) 2015 The Rust Project Developers
2+
3+
Permission is hereby granted, free of charge, to any
4+
person obtaining a copy of this software and associated
5+
documentation files (the "Software"), to deal in the
6+
Software without restriction, including without
7+
limitation the rights to use, copy, modify, merge,
8+
publish, distribute, sublicense, and/or sell copies of
9+
the Software, and to permit persons to whom the Software
10+
is furnished to do so, subject to the following
11+
conditions:
12+
13+
The above copyright notice and this permission notice
14+
shall be included in all copies or substantial portions
15+
of the Software.
16+
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
18+
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
19+
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
20+
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
21+
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
22+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
23+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
24+
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
25+
DEALINGS IN THE SOFTWARE.

‎sources_non_forked/rust.vim/README.md

Lines changed: 78 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,96 @@
22

33
## Description
44

5-
This is a vim plugin provides [Rust][r] file detection and syntax highlighting.
6-
7-
It is synchronized daily to the vim support code in [rust-lang/rust][rr]'s
8-
master branch via cronjob.
5+
This is a Vim plugin that provides [Rust][r] file detection, syntax highlighting, formatting,
6+
[Syntastic][syn] integration, and more.
97

108
## Installation
119

1210
### Using [Vundle][v]
1311

14-
1. Add `Plugin 'wting/rust.vim'` to `~/.vimrc`
15-
2. `vim +PluginInstall +qall`
12+
1. Add `Plugin 'rust-lang/rust.vim'` to `~/.vimrc`
13+
2. `:PluginInstall` or `$ vim +PluginInstall +qall`
1614

1715
*Note:* Vundle will not automatically detect Rust files properly if `filetype
1816
on` is executed before Vundle. Please check the [quickstart][vqs] for more
1917
details.
2018

2119
### Using [Pathogen][p]
2220

23-
1. `cd ~/.vim/bundle`
24-
2. `git clone https://github.com/wting/rust.vim.git`
21+
```shell
22+
git clone --depth=1 https://github.com/rust-lang/rust.vim.git ~/.vim/bundle/rust.vim
23+
```
2524

26-
[rr]: https://github.com/rust-lang/rust
27-
[p]: https://github.com/tpope/vim-pathogen
28-
[r]: https://en.wikipedia.org/wiki/Rust_language
25+
### Using [NeoBundle][nb]
26+
27+
1. Add `NeoBundle 'rust-lang/rust.vim'` to `~/.vimrc`
28+
2. Re-open vim or execute `:source ~/.vimrc`
29+
30+
### Using [vim-plug][vp]
31+
32+
1. Add `Plug 'rust-lang/rust.vim'` to `~/.vimrc`
33+
2. `:PlugInstall` or `$ vim +PlugInstall +qall`
34+
35+
## Features
36+
37+
### Error checking with [Syntastic][syn]
38+
39+
`rust.vim` automatically registers `rustc` as a syntax checker
40+
with [Syntastic][syn]. Check Syntastic's documentation for
41+
information on how to customize its behaviour.
42+
43+
### Formatting with [rustfmt][rfmt]
44+
45+
The `:RustFmt` command will format your code with
46+
[rustfmt][rfmt] if installed.
47+
48+
Placing `let g:rustfmt_autosave = 1` in your `~/.vimrc` will
49+
enable automatic running of `:RustFmt` when you save a buffer.
50+
51+
Do `:help :RustFmt` for further formatting help and customization
52+
options.
53+
54+
### [Playpen][pp] integration
55+
56+
*Note:* This feature requires [webapi-vim][wav] to be installed.
57+
58+
The `:RustPlay` command will send the current selection, or if
59+
nothing is selected the current buffer, to the [Rust playpen][pp].
60+
61+
If you set g:rust_clip_command RustPlay will copy the url to the clipboard.
62+
63+
- Mac:
64+
65+
let g:rust_clip_command = 'pbcopy'
66+
67+
- Linux:
68+
69+
let g:rust_clip_command = 'xclip -selection clipboard'
70+
71+
[rfmt]: https://crates.io/crates/rustfmt/
72+
73+
## Help
74+
75+
Further help can be found in the documentation with `:Helptags` then `:help rust`.
76+
77+
Detailed help can be found in the documentation with `:help rust`.
78+
Helptags (`:help helptags`) need to be generated for this plugin
79+
in order to navigate the help. Most plugin managers will do this
80+
automatically, but check their documentation if that is not the case.
81+
82+
## License
83+
84+
Like Rust, rust.vim is primarily distributed under the terms of both the MIT
85+
license and the Apache License (Version 2.0). See LICENSE-APACHE and
86+
LICENSE-MIT for details.
87+
88+
[r]: https://www.rust-lang.org
2989
[v]: https://github.com/gmarik/vundle
3090
[vqs]: https://github.com/gmarik/vundle#quick-start
91+
[p]: https://github.com/tpope/vim-pathogen
92+
[nb]: https://github.com/Shougo/neobundle.vim
93+
[vp]: https://github.com/junegunn/vim-plug
94+
[rfmt]: https://github.com/rust-lang-nursery/rustfmt
95+
[syn]: https://github.com/scrooloose/syntastic
96+
[wav]: https://github.com/mattn/webapi-vim
97+
[pp]: https://play.rust-lang.org/

‎sources_non_forked/rust.vim/after/syntax/rust.vim

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
if !exists('g:rust_conceal') || !has('conceal') || &enc != 'utf-8'
1+
if !exists('g:rust_conceal') || g:rust_conceal == 0 || !has('conceal') || &enc != 'utf-8'
22
finish
33
endif
44

55
" For those who don't want to see `::`...
6-
if exists('g:rust_conceal_mod_path')
6+
if exists('g:rust_conceal_mod_path') && g:rust_conceal_mod_path != 0
77
syn match rustNiceOperator "::" conceal cchar=ㆍ
88
endif
99

@@ -18,14 +18,17 @@ syn match rustNiceOperator "=>" contains=rustFatRightArrowHead,rustFatRightArrow
1818
syn match rustNiceOperator /\<\@!_\(_*\>\)\@=/ conceal cchar=′
1919

2020
" For those who don't want to see `pub`...
21-
if exists('g:rust_conceal_pub')
21+
if exists('g:rust_conceal_pub') && g:rust_conceal_pub != 0
2222
syn match rustPublicSigil contained "pu" conceal cchar=＊
2323
syn match rustPublicRest contained "b" conceal cchar= 
2424
syn match rustNiceOperator "pub " contains=rustPublicSigil,rustPublicRest
2525
endif
2626

2727
hi link rustNiceOperator Operator
2828

29-
if !exists('g:rust_conceal_mod_path')
29+
if !(exists('g:rust_conceal_mod_path') && g:rust_conceal_mod_path != 0)
3030
hi! link Conceal Operator
31+
32+
" And keep it after a colorscheme change
33+
au ColorScheme <buffer> hi! link Conceal Operator
3134
endif

0 commit comments

Comments
 (0)