Merge remote-tracking branch 'origin/master' into temp

# Conflicts:
#	vimrc

.gitignore

@@ -1,3 +1,4 @@
+session/**
 bundle/**
 spell/**
 .netrwhist

README.md

@@ -7,3 +7,11 @@ git clone https://github.com/wreed4/vimrc.git ~/.vim
 cd ~/.vim
 ./make_links.sh
 ```
+
+or
+
+```bash
+git clone git@github.com:wreed4/vimrc.git ~/.vim
+cd ~/.vim
+./make_links.sh
+```

UltiSnips/go.snippets

@@ -0,0 +1,9 @@
+priority 0
+
+snippet eli "else if .. (eli)"
+else if ${1:/* condition */} {
+	${VISUAL}$0
+}
+endsnippet
+
+

UltiSnips/python.snippets

@@ -0,0 +1,9 @@
+snippet #! "Shebang"
+#!/usr/bin/env python3
+
+$0
+endsnippet
+
+snippet pylint "pylint-disable"
+# pylint: disable=$0
+endsnippet

autoload/pyclewn.vim

@@ -1,187 +0,0 @@
-" pyclewn run time file
-" Maintainer:   <xdegaye at users dot sourceforge dot net>
-"
-" Configure VIM to be used with pyclewn and netbeans
-"
-if exists("s:did_pyclewn")
-    finish
-endif
-let s:did_pyclewn = 1
-
-let s:start_err = "Error: pyclewn failed to start, "
-let s:start_err .= "run the 'pyclewn' program to get the cause of the problem."
-
-" The following variables define how pyclewn is started when
-" the ':Pyclewn' vim command is run.
-" They may be changed to match your preferences.
-
-let s:pgm = "pyclewn"
-
-if exists("pyclewn_args")
-  let s:args = pyclewn_args
-else
-  let s:args = "--window=top --maxlines=10000 --background=Cyan,Green,Magenta"
-endif
-
-if exists("pyclewn_connection")
-  let s:connection = pyclewn_connection
-else
-  let s:connection = "localhost:3219:changeme"
-endif
-
-" Uncomment the following line to print full traces in a file named 'logfile'
-" for debugging purpose.
-" let s:args .= " --level=nbdebug --file=logfile"
-
-" The 'Pyclewn' command starts pyclewn and vim netbeans interface.
-let s:fixed = "--daemon --editor= --netbeans=" . s:connection . " --cargs="
-
-" Run the 'Cinterrupt' command to open the console
-function s:start_pdb(args)
-    let argl = split(a:args)
-    if index(argl, "--pdb") != -1
-        " find the prefix
-        let prefix = "C"
-        let idx = index(argl, "-x")
-        if idx == -1
-            let idx = index(argl, "--prefix")
-            if idx == -1
-                for item in argl
-                    if stridx(item, "--prefix") == 0
-                        let pos = stridx(item, "=")
-                        if pos != -1
-                            let prefix = strpart(item, pos + 1)
-                        endif
-                    endif
-                endfor
-            endif
-        endif
-
-        if idx != -1 && len(argl) > idx + 1
-            let prefix = argl[idx + 1]
-        endif
-
-        " hack to prevent Vim being stuck in the command line with '--More--'
-        echohl WarningMsg
-        echo "About to run the 'interrupt' command."
-        call inputsave()
-        call input("Press the <Enter> key to continue.")
-        call inputrestore()
-        echohl None
-        exe prefix . "interrupt"
-    endif
-endfunction
-
-" Check wether pyclewn successfully wrote the script file
-function s:pyclewn_ready(filename)
-    let l:cnt = 1
-    let l:max = 20
-    echohl WarningMsg
-    while l:cnt < l:max
-        echon "."
-        let l:cnt = l:cnt + 1
-        if filereadable(a:filename)
-            break
-        endif
-        sleep 200m
-    endwhile
-    echohl None
-    if l:cnt == l:max
-        throw s:start_err
-    endif
-    call s:info("Creation of vim script file \"" . a:filename . "\": OK.\n")
-endfunction
-
-" Start pyclewn and vim netbeans interface.
-function s:start(args)
-    if !exists(":nbstart")
-        throw "Error: the ':nbstart' vim command does not exist."
-    endif
-    if has("netbeans_enabled")
-        throw "Error: netbeans is already enabled and connected."
-    endif
-    if !executable(s:pgm)
-        throw "Error: '" . s:pgm . "' cannot be found or is not an executable."
-    endif
-    let l:tmpfile = tempname()
-
-    " remove console and dbgvar buffers from previous session
-    if bufexists("(clewn)_console")
-        bwipeout (clewn)_console
-    endif
-    if bufexists("(clewn)_dbgvar")
-        bwipeout (clewn)_dbgvar
-    endif
-
-    " start pyclewn and netbeans
-    call s:info("Starting pyclewn.\n")
-    exe "silent !" . s:pgm . " " . a:args . " " . s:fixed . l:tmpfile . " &"
-    call s:info("Running nbstart, <C-C> to interrupt.\n")
-    call s:pyclewn_ready(l:tmpfile)
-    exe "nbstart :" . s:connection
-
-    " source vim script
-    if has("netbeans_enabled")
-        if !filereadable(l:tmpfile)
-            nbclose
-            throw s:start_err
-        endif
-        " the pyclewn generated vim script is sourced only once
-        if ! exists("s:source_once")
-            let s:source_once = 1
-            exe "source " . l:tmpfile
-        endif
-        call s:info("The netbeans socket is connected.\n")
-        call s:start_pdb(a:args)
-    else
-        throw "Error: the netbeans socket could not be connected."
-    endif
-endfunction
-
-function pyclewn#StartClewn(...)
-    " command to start pdb: Pyclewn pdb foo.py arg1 arg2 ....
-    let l:args = s:args
-    if a:0 != 0
-        if a:1 == "pdb"
-            if a:0 == 2 && filereadable(a:2) == 0
-                call s:error("File '" . a:2 . "' is not readable.")
-                return
-            endif
-            let l:args .= " --pdb"
-            if a:0 > 1
-                let l:args .= " --args \"" . join(a:000[1:], ' ') . "\""
-            endif
-        else
-            call s:error("Invalid optional first argument: must be 'pdb'.")
-            return
-        endif
-    endif
-
-    try
-        call s:start(l:args)
-    catch /.*/
-        call s:info("The 'Pyclewn' command has been aborted.\n")
-        call s:error(v:exception)
-        " vim console screen is garbled, redraw the screen
-        if !has("gui_running")
-            redraw!
-        endif
-        " clear the command line
-        echo "\n"
-    endtry
-endfunction
-
-function s:info(msg)
-    echohl WarningMsg
-    echo a:msg
-    echohl None
-endfunction
-
-function s:error(msg)
-    echohl ErrorMsg
-    echo a:msg
-    call inputsave()
-    call input("Press the <Enter> key to continue.")
-    call inputrestore()
-    echohl None
-endfunction

coc-settings.json

@@ -0,0 +1,36 @@
+{
+  "python.jediEnabled": false,
+  "languageserver": {
+    "dockerfile": {
+      "command": "docker-langserver",
+      "filetypes": ["dockerfile"],
+      "args": ["--stdio"]
+    },
+    "bash": {
+      "command": "bash-language-server",
+      "args": ["start"],
+      "filetypes": ["sh"],
+      "ignoredRootPaths": ["~"]
+    },
+    "python": {
+      "command": "python",
+      "args": [
+	"-mpyls",
+	"-vv"
+      ],
+      "filetypes": [
+	"python"
+      ],
+      "settings": {
+	"pyls": {
+	  "enable": true,
+	  "plugins": {
+	    "pyls_mypy": {
+	      "enabled": true
+	    }
+	  }
+	}
+      }
+    }
+  }
+}

doc/tags

@@ -1,37 +0,0 @@
-$cdir	pyclewn.txt	/*$cdir*
-:Pyclewn	pyclewn.txt	/*:Pyclewn*
-C	pyclewn.txt	/*C*
-Cclear	pyclewn.txt	/*Cclear*
-Ccommand	pyclewn.txt	/*Ccommand*
-Cdbgvar	pyclewn.txt	/*Cdbgvar*
-Cdelvar	pyclewn.txt	/*Cdelvar*
-Cdetach	pyclewn.txt	/*Cdetach*
-Cfoldvar	pyclewn.txt	/*Cfoldvar*
-Cinferiortty	pyclewn.txt	/*Cinferiortty*
-Cinterrupt	pyclewn.txt	/*Cinterrupt*
-Cmapkeys	pyclewn.txt	/*Cmapkeys*
-Cquit	pyclewn.txt	/*Cquit*
-Csetfmtvar	pyclewn.txt	/*Csetfmtvar*
-Csymcompletion	pyclewn.txt	/*Csymcompletion*
-Cthreadstack	pyclewn.txt	/*Cthreadstack*
-async-option	pyclewn.txt	/*async-option*
-gdb-balloon	pyclewn.txt	/*gdb-balloon*
-gdb-keys	pyclewn.txt	/*gdb-keys*
-inferior_tty	pyclewn.txt	/*inferior_tty*
-inferiortty	pyclewn.txt	/*inferiortty*
-pdb-keys	pyclewn.txt	/*pdb-keys*
-pdb-pdbrc	pyclewn.txt	/*pdb-pdbrc*
-project-command	pyclewn.txt	/*project-command*
-project-file	pyclewn.txt	/*project-file*
-pyclewn	pyclewn.txt	/*pyclewn*
-pyclewn-console	pyclewn.txt	/*pyclewn-console*
-pyclewn-extending	pyclewn.txt	/*pyclewn-extending*
-pyclewn-gdb	pyclewn.txt	/*pyclewn-gdb*
-pyclewn-intro	pyclewn.txt	/*pyclewn-intro*
-pyclewn-mappings	pyclewn.txt	/*pyclewn-mappings*
-pyclewn-options	pyclewn.txt	/*pyclewn-options*
-pyclewn-pdb	pyclewn.txt	/*pyclewn-pdb*
-pyclewn-using	pyclewn.txt	/*pyclewn-using*
-pyclewn-variable	pyclewn.txt	/*pyclewn-variable*
-pyclewn-windows	pyclewn.txt	/*pyclewn-windows*
-pyclewn.txt	pyclewn.txt	/*pyclewn.txt*

macros/.pyclewn_keys.gdb

@@ -1,49 +0,0 @@
-# .pyclewn_keys.gdb file
-#
-# The default placement for this file is $CLEWNDIR/.pyclewn_keys.gdb, or
-# $HOME/.pyclewn_keys.gdb
-#
-# Key definitions are of the form `KEY:COMMAND'
-# where the following macros are expanded:
-#    ${text}:   the word or selection below the mouse
-#    ${fname}:  the current buffer full pathname
-#    ${lnum}:   the line number at the cursor position
-#
-# All characters following `#' up to the next new line are ignored.
-# Leading blanks on each line are ignored. Empty lines are ignored.
-#
-# To tune the settings in this file, you will have to uncomment them,
-# as well as change them, as the values on the commented-out lines
-# are the default values. You can also add new entries. To remove a
-# default mapping, use an empty GDB command.
-#
-# Supported key names:
-#       . key function: F1 to F20
-#             e.g., `F11:continue'
-#       . modifier (C-,S-,M-) + function key
-#             e.g., `C-F5:run'
-#       . modifier (or modifiers) + character
-#             e.g., `S-Q:quit', `C-S-B:info breakpoints'
-#
-# Note that a modifier is required for non-function keys. So it is not possible
-# to map a lower case character with this method (use the Vim 'map' command
-# instead).
-#
-# C-B : break "${fname}":${lnum} # set breakpoint at current line
-# C-D : down
-# C-E : clear "${fname}":${lnum} # clear breakpoint at current line
-# C-N : next
-# C-P : print ${text}            # print value of selection at mouse position
-# C-U : up
-# C-X : print *${text}           # print value referenced by word at mouse position
-# C-Z : sigint                   # kill the inferior running program
-# S-A : info args
-# S-B : info breakpoints
-# S-C : continue
-# S-F : finish
-# S-L : info locals
-# S-Q : quit
-# S-R : run
-# S-S : step
-# S-W : where
-# S-X : foldvar ${lnum}          # expand/collapse a watched variable

macros/.pyclewn_keys.pdb

@@ -1,44 +0,0 @@
-# .pyclewn_keys.pdb file
-#
-# The default placement for this file is $CLEWNDIR/.pyclewn_keys.pdb, or
-# $HOME/.pyclewn_keys.pdb
-#
-# Key definitions are of the form `KEY:COMMAND'
-# where the following macros are expanded:
-#    ${text}:   the word or selection below the mouse
-#    ${fname}:  the current buffer full pathname
-#    ${lnum}:   the line number at the cursor position
-#
-# All characters following `#' up to the next new line are ignored.
-# Leading blanks on each line are ignored. Empty lines are ignored.
-#
-# To tune the settings in this file, you will have to uncomment them,
-# as well as change them, as the values on the commented-out lines
-# are the default values. You can also add new entries. To remove a
-# default mapping, use an empty GDB command.
-#
-# Supported key names:
-#       . key function: F1 to F20
-#             e.g., `F11:continue'
-#       . modifier (C-,S-,M-) + function key
-#             e.g., `C-F5:run'
-#       . modifier (or modifiers) + character
-#             e.g., `S-Q:quit', `C-S-B:info breakpoints'
-#
-# Note that a modifier is required for non-function keys. So it is not possible
-# to map a lower case character with this method (use the Vim 'map' command
-# instead).
-#
-# C-B : break "${fname}:${lnum}" # set breakpoint at current line
-# C-D : down
-# C-E : clear "${fname}:${lnum}" # clear breakpoint at current line
-# C-N : next
-# C-P : p ${text}                # print value of selection at mouse position
-# C-U : up
-# C-Z : interrupt
-# S-A : args
-# S-B : break
-# S-C : continue
-# S-R : return
-# S-S : step
-# S-W : where

macros/.pyclewn_keys.simple

@@ -1,38 +0,0 @@
-# .pyclewn_keys.simple file
-#
-# The default placement for this file is $CLEWNDIR/.pyclewn_keys.simple, or
-# $HOME/.pyclewn_keys.simple
-#
-# Key definitions are of the form `KEY:COMMAND'
-# where the following macros are expanded:
-#    ${text}:   the word or selection below the mouse
-#    ${fname}:  the current buffer full pathname
-#    ${lnum}:   the line number at the cursor position
-#
-# All characters following `#' up to the next new line are ignored.
-# Leading blanks on each line are ignored. Empty lines are ignored.
-#
-# To tune the settings in this file, you will have to uncomment them,
-# as well as change them, as the values on the commented-out lines
-# are the default values. You can also add new entries. To remove a
-# default mapping, use an empty GDB command.
-#
-# Supported key names:
-#       . key function: F1 to F20
-#             e.g., `F11:continue'
-#       . modifier (C-,S-,M-) + function key
-#             e.g., `C-F5:run'
-#       . modifier (or modifiers) + character
-#             e.g., `S-Q:quit', `C-S-B:info breakpoints'
-#
-# Note that a modifier is required for non-function keys. So it is not possible
-# to map a lower case character with this method (use the Vim 'map' command
-# instead).
-#
-# C-B : break ${fname}:${lnum}   # set breakpoint at current line
-# C-E : clear ${fname}:${lnum}   # clear breakpoint at current line
-# C-P : print ${text}            # print value of selection at mouse position
-# C-Z : interrupt                # interrupt the execution of the target
-# S-C : continue
-# S-Q : quit
-# S-S : step

make_links.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 
+mkdir -p ~/.config  # check for existence of .config and create if it doesn't exist
+[[ -f ~/.config/nvim ]] && mv ~/.config/nvim ~/.config/nvim.old
 ln -s ~/.vim ~/.config/nvim 

plugin/pyclewn.vim

@@ -1,17 +0,0 @@
-" pyclewn run time file
-" Maintainer:   <xdegaye at users dot sourceforge dot net>
-"
-" Configure VIM to be used with pyclewn and netbeans
-"
-
-" pyclewn version
-let g:pyclewn_version = "pyclewn-1.11.py2"
-
-" enable balloon_eval
-if has("balloon_eval")
-    set ballooneval
-    set balloondelay=100
-endif
-
-" The 'Pyclewn' command starts pyclewn and vim netbeans interface.
-command -nargs=* -complete=file Pyclewn call pyclewn#StartClewn(<f-args>)

syntax/dbgvar.vim

@@ -1,25 +0,0 @@
-" Vim syntax file
-" Language:	debugger variables window syntax file
-" Maintainer:	<xdegaye at users dot sourceforge dot net>
-" Last Change:	Oct 8 2007
-
-if exists("b:current_syntax")
-    finish
-endif
-
-syn region dbgVarChged display contained matchgroup=dbgIgnore start="={\*}"ms=s+1 end="$"
-syn region dbgDeScoped display contained matchgroup=dbgIgnore start="={-}"ms=s+1 end="$"
-syn region dbgVarUnChged display contained matchgroup=dbgIgnore start="={=}"ms=s+1 end="$"
-
-syn match dbgItem display transparent "^.*$"
-    \ contains=dbgVarUnChged,dbgDeScoped,dbgVarChged,dbgVarNum
-
-syn match dbgVarNum display contained "^\s*\d\+:"he=e-1
-
-high def link dbgVarChged   Special
-high def link dbgDeScoped   Comment
-high def link dbgVarNum	    Identifier
-high def link dbgIgnore	    Ignore
-
-let b:current_syntax = "dbgvar"
-

syntax/snippet.vim

@@ -1,19 +0,0 @@
-" Syntax highlighting for snippet files (used for snipMate.vim)
-" Hopefully this should make snippets a bit nicer to write!
-syn match snipComment '^#.*'
-syn match placeHolder '\${\d\+\(:.\{-}\)\=}' contains=snipCommand
-syn match tabStop '\$\d\+'
-syn match snipCommand '[^\\]`.\{-}`'
-syn match snippet '^snippet.*' transparent contains=multiSnipText,snipKeyword
-syn match multiSnipText '\S\+ \zs.*' contained
-syn match snipKeyword '^snippet'me=s+8 contained
-syn match snipError "^[^#s\t].*$"
-
-hi link snipComment   Comment
-hi link multiSnipText String
-hi link snipKeyword   Keyword
-hi link snipComment   Comment
-hi link placeHolder   Special
-hi link tabStop       Special
-hi link snipCommand   String
-hi link snipError     Error