Egad boom
This commit is contained in:
parent
88e4ac8215
commit
4dad87874c
@ -6,3 +6,4 @@ TAGS
|
||||
*.rbc
|
||||
*.class
|
||||
.vagrant
|
||||
*.swp
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit 7225b212474c2add040259114061ec1d9a7721d7
|
||||
@ -1,91 +0,0 @@
|
||||
" Protocol Buffers - Google's data interchange format
|
||||
" Copyright 2008 Google Inc.
|
||||
"
|
||||
" Licensed under the Apache License, Version 2.0 (the "License");
|
||||
" you may not use this file except in compliance with the License.
|
||||
" You may obtain a copy of the License at
|
||||
"
|
||||
" http:"www.apache.org/licenses/LICENSE-2.0
|
||||
"
|
||||
" Unless required by applicable law or agreed to in writing, software
|
||||
" distributed under the License is distributed on an "AS IS" BASIS,
|
||||
" WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
" See the License for the specific language governing permissions and
|
||||
" limitations under the License.
|
||||
|
||||
" This is the Vim syntax file for Google Protocol Buffers.
|
||||
"
|
||||
" Usage:
|
||||
"
|
||||
" 1. cp proto.vim ~/.vim/syntax/
|
||||
" 2. Add the following to ~/.vimrc:
|
||||
"
|
||||
" augroup filetype
|
||||
" au! BufRead,BufNewFile *.proto setfiletype proto
|
||||
" augroup end
|
||||
"
|
||||
" Or just create a new file called ~/.vim/ftdetect/proto.vim with the
|
||||
" previous lines on it.
|
||||
|
||||
if version < 600
|
||||
syntax clear
|
||||
elseif exists("b:current_syntax")
|
||||
finish
|
||||
endif
|
||||
|
||||
syn case match
|
||||
|
||||
syn keyword pbTodo contained TODO FIXME XXX
|
||||
syn cluster pbCommentGrp contains=pbTodo
|
||||
|
||||
syn keyword pbSyntax syntax import option
|
||||
syn keyword pbStructure package message group
|
||||
syn keyword pbRepeat optional required repeated
|
||||
syn keyword pbDefault default
|
||||
syn keyword pbExtend extend extensions to max
|
||||
syn keyword pbRPC service rpc returns
|
||||
|
||||
syn keyword pbType int32 int64 uint32 uint64 sint32 sint64
|
||||
syn keyword pbType fixed32 fixed64 sfixed32 sfixed64
|
||||
syn keyword pbType float double bool string bytes
|
||||
syn keyword pbTypedef enum
|
||||
syn keyword pbBool true false
|
||||
|
||||
syn match pbInt /-\?\<\d\+\>/
|
||||
syn match pbInt /\<0[xX]\x+\>/
|
||||
syn match pbFloat /\<-\?\d*\(\.\d*\)\?/
|
||||
" TODO: .proto also supports C-style block comments;
|
||||
" see /usr/share/vim/vim70/syntax/c.vim for how it's done.
|
||||
syn region pbComment start="//" skip="\\$" end="$" keepend contains=@pbCommentGrp
|
||||
syn region pbString start=/"/ skip=/\\"/ end=/"/
|
||||
syn region pbString start=/'/ skip=/\\'/ end=/'/
|
||||
|
||||
if version >= 508 || !exists("did_proto_syn_inits")
|
||||
if version < 508
|
||||
let did_proto_syn_inits = 1
|
||||
command -nargs=+ HiLink hi link <args>
|
||||
else
|
||||
command -nargs=+ HiLink hi def link <args>
|
||||
endif
|
||||
|
||||
HiLink pbTodo Todo
|
||||
|
||||
HiLink pbSyntax Include
|
||||
HiLink pbStructure Structure
|
||||
HiLink pbRepeat Repeat
|
||||
HiLink pbDefault Keyword
|
||||
HiLink pbExtend Keyword
|
||||
HiLink pbRPC Keyword
|
||||
HiLink pbType Type
|
||||
HiLink pbTypedef Typedef
|
||||
HiLink pbBool Boolean
|
||||
|
||||
HiLink pbInt Number
|
||||
HiLink pbFloat Float
|
||||
HiLink pbComment Comment
|
||||
HiLink pbString String
|
||||
|
||||
delcommand HiLink
|
||||
endif
|
||||
|
||||
let b:current_syntax = "proto"
|
||||
@ -1,42 +0,0 @@
|
||||
From 7a9d955c0141d4adb148ba0b128d302b82f2f307 Mon Sep 17 00:00:00 2001
|
||||
From: Spencer Deinum <spencerdeinum@gmail.com>
|
||||
Date: Thu, 30 Aug 2012 00:43:12 -0400
|
||||
Subject: [PATCH] Edited scala checker to use scalac, with the
|
||||
-Ystop-after:refchecks option.
|
||||
|
||||
This means syntax checking is done via the compiler instead of the
|
||||
interpreter, so it won't choke on things like package definitions.
|
||||
|
||||
The -Ystop-after:refchecks option will stop before code is actually
|
||||
generated, so we don't emit any class files.
|
||||
|
||||
Signed-off-by: Spencer Deinum <spencerdeinum@gmail.com>
|
||||
---
|
||||
syntax_checkers/scala.vim | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/syntax_checkers/scala.vim b/syntax_checkers/scala.vim
|
||||
index f6f05af..d603246 100644
|
||||
--- a/syntax_checkers/scala.vim
|
||||
+++ b/syntax_checkers/scala.vim
|
||||
@@ -15,7 +15,7 @@ endif
|
||||
let loaded_scala_syntax_checker = 1
|
||||
|
||||
"bail if the user doesnt have the scala binary installed
|
||||
-if !executable("scala")
|
||||
+if !executable("scalac")
|
||||
finish
|
||||
endif
|
||||
|
||||
@@ -24,7 +24,7 @@ if !exists("g:syntastic_scala_options")
|
||||
endif
|
||||
|
||||
function! SyntaxCheckers_scala_GetLocList()
|
||||
- let makeprg = 'scala '. g:syntastic_scala_options .' '. shellescape(expand('%')) . ' /dev/null'
|
||||
+ let makeprg = 'scalac -Ystop-after:refchecks '. g:syntastic_scala_options .' '. shellescape(expand('%'))
|
||||
|
||||
let errorformat = '%f\:%l: %trror: %m'
|
||||
|
||||
--
|
||||
1.7.10
|
||||
|
||||
21
vimrc
Normal file
21
vimrc
Normal file
@ -0,0 +1,21 @@
|
||||
syntax on
|
||||
|
||||
filetype on
|
||||
filetype indent on
|
||||
filetype plugin on
|
||||
|
||||
set directory^=~/.vim/_temp//
|
||||
set hlsearch
|
||||
set ignorecase
|
||||
set incsearch
|
||||
set laststatus=2
|
||||
set nowrap
|
||||
set number
|
||||
set smartcase
|
||||
set tabstop=4
|
||||
set textwidth=67
|
||||
|
||||
map ,t :w<CR>
|
||||
map ,- :nohl<CR>
|
||||
|
||||
call pathogen#infect()
|
||||
@ -142,7 +142,7 @@ if !has('gui_running')
|
||||
set t_Co=256
|
||||
"colorscheme gardener
|
||||
"colorscheme inkpot
|
||||
colorscheme delek
|
||||
colorscheme molokai
|
||||
endif
|
||||
|
||||
let g:valgrind_arguments='--leak-check=yes --num-callers=50'
|
||||
|
||||
28
xinitrc
28
xinitrc
@ -2,35 +2,7 @@ test -f /etc/rc.conf && source /etc/rc.conf
|
||||
setxkbmap ${KEYMAP-dvorak}
|
||||
|
||||
|
||||
DEFAULT="ratpoison"
|
||||
|
||||
|
||||
case "$1" in
|
||||
awe*)
|
||||
exec awesome
|
||||
;;
|
||||
evil*)
|
||||
exec evilwm
|
||||
;;
|
||||
open*)
|
||||
exec openbox-session
|
||||
;;
|
||||
win*)
|
||||
exec wmaker
|
||||
;;
|
||||
flux*)
|
||||
exec startfluxbox
|
||||
;;
|
||||
gno*)
|
||||
exec gnome-session
|
||||
;;
|
||||
rat*)
|
||||
exec ratpoison
|
||||
;;
|
||||
*)
|
||||
exec $DEFAULT
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
# vim:filetype=sh
|
||||
|
||||
27
zshrc
27
zshrc
@ -44,9 +44,10 @@ bindkey '^R' history-incremental-search-backward
|
||||
|
||||
path=(
|
||||
$HOME/bin
|
||||
$HOME/.goenv/bin
|
||||
$HOME/gopath/bin
|
||||
$HOME/.rbenv/bin
|
||||
$HOME/.rbenv/shims
|
||||
$HOME/src/gocode/bin
|
||||
/usr/local/sbin
|
||||
/usr/local/bin
|
||||
/usr/sbin
|
||||
@ -57,14 +58,22 @@ path=(
|
||||
/usr/local/games
|
||||
)
|
||||
|
||||
if [ -f ~/.gvm/scripts/gvm ] ; then
|
||||
source ~/.gvm/scripts/gvm
|
||||
gvm use go1.2
|
||||
if [ -f ~/src/gocode/src/.env ] ; then
|
||||
unset _GOCODE_DID_SETUP
|
||||
source ~/src/gocode/src/.env
|
||||
fi
|
||||
fi
|
||||
#if [ -f ~/.gvm/scripts/gvm ] ; then
|
||||
#source ~/.gvm/scripts/gvm
|
||||
#gvm use go1.2
|
||||
#if [ -f ~/src/gocode/src/.env ] ; then
|
||||
#unset _GOCODE_DID_SETUP
|
||||
#source ~/src/gocode/src/.env
|
||||
#fi
|
||||
#fi
|
||||
|
||||
eval "$(goenv init -)"
|
||||
export GOPATH="$HOME/gopath"
|
||||
|
||||
CDPATH="$HOME/src:$HOME/repos"
|
||||
for prefix in github.com code.google.com/p ; do
|
||||
CDPATH="$HOME/gopath/src/$prefix:$CDPATH"
|
||||
done
|
||||
|
||||
source ~/.bash_aliases
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user