Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
View
4 .gitmodules
@@ -38,3 +38,7 @@
path = .vim/bundle/vim-surround
url = https://github.com/tpope/vim-surround.git
ignore = dirty
+[submodule ".vim/bundle/vim-ps1"]
+ path = .vim/bundle/vim-ps1
+ url = https://github.com/PProvost/vim-ps1.git
+ ignore = dirty
View
27 .vim/bundle/ps1/ftplugin/ps1.vim
@@ -1,27 +0,0 @@
-" Vim filetype plugin file
-" Language: Windows PowerShell
-" Maintainer: Peter Provost <peter@provost.org>
-" Version: 1.0
-"
-" $LastChangedDate $
-" $Rev $
-
-" Only do this when not done yet for this buffer
-if exists("b:did_ftplugin") | finish | endif
-
-" Don't load another plug-in for this buffer
-let b:did_ftplugin = 1
-
-setlocal tw=0
-setlocal commentstring=#%s
-setlocal formatoptions=tcqro
-
-" Change the browse dialog on Win32 to show mainly PowerShell-related files
-if has("gui_win32")
- let b:browsefilter = "PowerShell Files (*.ps1)\t*.ps1\n" .
- \ "All Files (*.*)\t*.*\n"
-endif
-
-" Undo the stuff we changed
-let b:undo_ftplugin = "setlocal tw< cms< fo<" .
- \ " | unlet! b:browsefilter"
View
96 .vim/bundle/ps1/indent/ps1.vim
@@ -1,96 +0,0 @@
-" Vim indent file
-" Language: PowerShell
-" Maintainer: Lior Elia - http://blogs.msdn.com/lior
-" Version: 2.0
-" Last Change: 2009 Oct 18
-" Changelist:
-" Ver Date By Fixed indentation of...
-" ----- ---------- -------- -----------------------------------------
-" 1.0 2009-10-04 LiorE Comment rows
-" 2.0 2009-10-18 LiorE Lines after (.*), comments after '{' or
-" '}' and many many other things. I've made
-" this a major version change because there
-" are many changes in the behavior.
-
-" Dedicated to my loving and supporting family: Anat, Amit and Ofir.
-
-" Only load this indent file when no other was loaded.
-if exists("b:did_indent")
- finish
-endif
-let b:did_indent = 1
-
-setlocal cindent cinoptions& cinoptions+=+0
-
-" Set the function to do the work.
-setlocal indentexpr=GetPsIndent()
-
-let b:undo_indent = "set cin< cino< indentkeys< indentexpr<"
-
-" Only define the function once.
-if exists("*GetPsIndent")
- finish
-endif
-
-function! Log(text)
- " Enable the line below for debugging
- " call confirm(a:text)
-endfunction
-
-function! SkipPsComments(startline)
- let lnum = a:startline
- while lnum > 1
- let lnum = prevnonblank(lnum)
- if getline(lnum) =~ '^\s*#'
- let lnum = lnum - 1
- else
- break
- endif
- endwhile
- return lnum
-endfunction
-
-function GetPsIndent()
-
- " PowerShell is almost like C; use the built-in C indenting and then correct the comment/precompiler duality.
- let theIndent = cindent(v:lnum)
- let prevLine = SkipPsComments(v:lnum-1)
-if (prevLine > 0)
- let prevLineIndent = indent(prevLine)
-else
- let prevLineIndent = 0
-endif
-
- call Log("prevline " . prevLine . " - Indent is " . prevLineIndent)
- " if prev line ends with paranthesis (...) it messes the indentation
- if getline(prevLine) =~ '(.*)$'
- " set the indent to be the same of the prev non blank non comment line
- let theIndent = prevLineIndent
- if getline(v:lnum) =~ '^[^{]*}'
- " remove one indentation level, clsoing a block
- let theIndent -= &sw
- endif
- endif
-
- " comment lines are mishandled as precompiler directives ('#') so fix that.
-
- call Log("before comment - Indent is " . theIndent)
- " if current line is a comment...
- if getline(v:lnum) =~ '^\s*#'
- let theIndent = prevLineIndent
- " if prev line opened a block -
- if getline(prevLine) =~ '{$'
- " indent once more, because we're in a beginning of a block
- let theIndent += &sw
- elseif getline(prevLine) =~ '([^)]*$'
- " indent twice more, because we're in a beginning of a parameters
- " block which gets indented twice by cindent, for some obscure
- " reason...
- let theIndent += &sw
- let theIndent += &sw
- endif
- endif
- call Log("After - Indent is " . theIndent)
- return theIndent
-endfunction
-
View
136 .vim/bundle/ps1/syntax/ps1.vim
@@ -1,136 +0,0 @@
-" Vim syntax file
-" Language: Windows PowerShell
-" Maintainer: Peter Provost <peter@provost.org>
-" Version: 2.8
-" Url: http://www.vim.org/scripts/script.php?script_id=1327
-"
-" $LastChangedDate: 2007-03-05 21:18:39 -0800 (Mon, 05 Mar 2007) $
-" $Rev: 58 $
-"
-" Contributions by:
-" Jared Parsons <jaredp@beanseed.org>
-" Heath Stewart <heaths@microsoft.com>
-" Tomas Restrepo <tomas@winterdom.com>
-
-" Compatible VIM syntax file start
-if version < 600
- syntax clear
-elseif exists("b:current_syntax")
- finish
-endif
-
-" PowerShell doesn't care about case
-syn case ignore
-
-" Sync-ing method
-syn sync minlines=100
-
-syn cluster ps1NotTop contains=@ps1Comment,ps1CDocParam,ps1Function
-
-
-" Comments and special comment words
-syn keyword ps1CommentTodo TODO FIXME XXX TBD HACK contained
-syn match ps1CDocParam /.*/ contained
-syn match ps1CommentDoc /^\s*\zs\.\w\+\>/ nextgroup=ps1CDocParam contained
-syn match ps1CommentDoc /#\s*\zs\.\w\+\>/ nextgroup=ps1CDocParam contained
-syn match ps1Comment /#.*/ contains=ps1CommentTodo,ps1CommentDoc
-syn region ps1Comment start="<#" end="#>" contains=ps1CommentTodo,ps1CommentDoc
-
-" Language keywords and elements
-syn keyword ps1Conditional if else elseif switch
-syn keyword ps1Repeat while default for do until break continue
-syn match ps1Repeat /\<foreach\>/ nextgroup=ps1Cmdlet
-syn keyword ps1Keyword return filter in trap throw param begin process end
-syn match ps1Keyword /\<while\>/ nextgroup=ps1Cmdlet
-
-" Functions and Cmdlets
-syn match ps1Cmdlet /\w\+-\w\+/
-syn keyword ps1Keyword function nextgroup=ps1Function skipwhite
-syn match ps1Function /\w\+-*\w*/ contained
-
-" Type declarations
-syn match ps1Type /\[[a-z0-9_:.]\+\(\[\]\)\?\]/
-"syn match ps1StandaloneType /[a-z0-9_.]\+/ contained
-syn keyword ps1Scope global local private script contained
-
-" Variables and other user defined items
-syn match ps1Variable /\$\w\+/
-syn match ps1Variable /\${.\+}/
-syn match ps1ScopedVariable /\$\w\+:\w\+/ contains=ps1Scope
-"syn match ps1VariableName /\w\+/ contained
-
-" Operators all start w/ dash
-syn match ps1OperatorStart /-c\?/ nextgroup=ps1Operator
-syn keyword ps1Operator eq ne ge gt lt le like notlike match notmatch replace /contains/ notcontains contained
-syn keyword ps1Operator ieq ine ige igt ile ilt ilike inotlike imatch inotmatch ireplace icontains inotcontains contained
-syn keyword ps1Operator ceq cne cge cgt clt cle clike cnotlike cmatch cnotmatch creplace ccontains cnotcontains contained
-syn keyword ps1Operator is isnot as contained
-syn keyword ps1Operator and or band bor not contained
-syn keyword ps1Operator f contained
-syn keyword ps1Operator split contained
-
-" Regular Strings
-syn region ps1String start=/"/ skip=/`"/ end=/"/ contains=@ps1StringSpecial
-syn region ps1String start=/'/ end=/'/
-
-" Here-Strings
-syn region ps1String start=/@"$/ end=/^"@$/ contains=@ps1StringSpecial
-syn region ps1String start=/@'$/ end=/^'@$/
-
-" Interpolation
-syn match ps1Escape /`./ contained
-syn region ps1Interpolation matchgroup=ps1InterpolationDelimiter start="$(" end=")" contained contains=ALLBUT,@ps1NotTop
-syn region ps1NestedParentheses start="(" skip="\\\\\|\\)" matchgroup=ps1Interpolation end=")" transparent contained
-syn cluster ps1StringSpecial contains=ps1Escape,ps1Interpolation,ps1Variable,ps1Boolean,ps1Constant,ps1BuiltIn
-
-" Numbers
-syn match ps1Number /\<[0-9]\+/
-syn match ps1Number /\<0x[0-9A-Fa-f]\+/
-syn match ps1Number /\<[0-9]\*\.[0-9]\+/
-
-" constants
-syn match ps1Boolean "$\%(true\|false\)\>"
-syn match ps1Constant /\$null\>/
-syn match ps1BuiltIn "$^\|$?\|$_\|$\$"
-syn match ps1BuiltIn "$\%(args\|error\|foreach\|home\|input\)\>"
-syn match ps1BuiltIn "$\%(match\(es\)\?\|myinvocation\|host\|lastexitcode\)\>"
-syn match ps1BuiltIn "$\%(ofs\|shellid\|stacktrace\)\>"
-
-" Setup default color highlighting
-if version >= 508 || !exists("did_ps1_syn_inits")
- if version < 508
- let did_ps1_syn_inits = 1
- command -nargs=+ HiLink hi link <args>
- else
- command -nargs=+ HiLink hi def link <args>
- endif
-
- HiLink ps1String String
- HiLink ps1Escape SpecialChar
- HiLink ps1InterpolationDelimiter Delimiter
- HiLink ps1Conditional Conditional
- HiLink ps1Function Function
- HiLink ps1Variable Identifier
- HiLink ps1ScopedVariable Identifier
-" HiLink ps1VariableName Identifier
- HiLink ps1Type Type
- HiLink ps1Scope Type
-" HiLink ps1StandaloneType Type
- HiLink ps1Number Number
- HiLink ps1Comment Comment
- HiLink ps1CommentDoc Tag
- HiLink ps1CDocParam Todo
- HiLink ps1CommentTodo Todo
- HiLink ps1Operator Operator
- HiLink ps1Repeat Repeat
- HiLink ps1RepeatAndCmdlet Repeat
- HiLink ps1Keyword Keyword
- HiLink ps1KeywordAndCmdlet Keyword
- HiLink ps1Cmdlet Statement
- HiLink ps1Boolean Boolean
- HiLink ps1Constant Constant
- HiLink ps1BuiltIn StorageClass
- delcommand HiLink
-endif
-
-let b:current_syntax = "powershell"
1  .vim/bundle/vim-ps1
@@ -0,0 +1 @@
+Subproject commit 29df22efd059a0bbe64acb6c6e6132aefa7cad33
View
2  .vimrc
@@ -13,6 +13,8 @@ set bg=dark
let g:zenburn_high_Contrast = 1
let g:liquidcarbon_high_contrast = 1
let g:molokai_original = 1
+let g:Powerline_symbols = 'compatible'
+let g:Powerline_cache_enabled = 1
let g:Powerline_cache_file = expand('$TMP/Powerline.cache')
set t_Co=256
colorscheme molokai

No commit comments for this range

Something went wrong with that request. Please try again.