update

Author: felix

Diff for: .lsp-session-v1

@@ -1 +1 @@
-#s(lsp-session ("/home/felix/Documents/fnlinker/other/filevue/fuckvue/") nil #s(hash-table size 65 test equal rehash-size 1.5 rehash-threshold 0.8125 data ()) #s(hash-table size 65 test equal rehash-size 1.5 rehash-threshold 0.8125 data ()) #s(hash-table size 65 test equal rehash-size 1.5 rehash-threshold 0.8125 data ()))
+#s(lsp-session ("/Users/felix/Documents/fnlinker/htmltopdf" "/Users/felix/Documents/fnlinker/fnlinker.convertservice.cad" "/home/felix/Documents/fnlinker/other/filevue/fuckvue/") nil #s(hash-table size 65 test equal rehash-size 1.5 rehash-threshold 0.8125 data ()) #s(hash-table size 65 test equal rehash-size 1.5 rehash-threshold 0.8125 data ()) #s(hash-table size 65 test equal rehash-size 1.5 rehash-threshold 0.8125 data ()))

Diff for: lisp/custom.el

@@ -1,12 +1,14 @@
 (setq company-minimum-prefix-length 1)
 (setq company-idle-delay 0.08)
-(set-default-font "Monaco 12")
+(set-default-font "Monaco 14")
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(org-agenda-files nil))
+ '(package-selected-packages
+   (quote
+    (company-lsp lsp-ui use-package lsp-mode lsp=mode emmet-mode scss-mode react-snippets rjsx-mode tide company-web diminish helm-projectile magit dashboard undo-tree mc-extras multiple-cursors fill-column-indicator go-gopath golint gotest go-projectile helm-gtags highlight-indent-guides mmm-mode powerline rainbow-delimiters rainbow-mode dracula-theme exec-path-from-shell fullframe company monokai-theme hungry-delete smartparens js2-mode nodejs-repl popwin omnisharp helm web-mode expand-region popup cnfonts org-pomodoro yasnippet helm-ag elpy py-autopep8 counsel go-mode company-go evil evil-leader window-numbering evil-surround evil-nerd-commenter which-key sql-indent dotnet iedit color-theme-sanityinc-tomorrow color-theme-sanityinc-solarized))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.

Diff for: lisp/init-go.el

@@ -1,10 +1,4 @@
-(require-package 'go-mode)
-
-(require-package 'company-go)
 (require-package 'go-projectile)
-(require-package 'gotest)
-(require-package 'golint)
-(require-package 'go-gopath)
 
 (defun go-mode-defaults ()
   ;; Prefer goimports to gofmt if installed
@@ -14,22 +8,57 @@
 
   (add-hook 'before-save-hook 'gofmt-before-save nil t)
   (whitespace-toggle-options '(tabs))
-  (set (make-local-variable 'company-backends) '(company-go))
+;;   (set (make-local-variable 'company-backends) '(company-go))
 
   (local-set-key (kbd "C-c C-b") 'pop-tag-mark)
   (local-set-key (kbd "C-c t") 'go-test-current-file)
   (local-set-key (kbd "C-c j") 'godef-jump)
+  (local-set-key (kbd "C-c s s") 'lsp-restart-workspace)
   (setq tab-width 4))
 
 (add-hook 'go-mode-hook 'go-mode-defaults)
 
+;; ;; (require-package 'protobuf-mode)
+;; ;; (defconst protobuf-style
+;; ;;   '((c-basic-offset . 2)
+;; ;;     (indent-tabs-mode . nil)))
+
+;; ;; (add-hook 'protobuf-mode-hook
+;; ;;           (lambda () (c-add-style "my-style" protobuf-style t)))
+
+(use-package lsp-mode
+  :ensure t
+  :commands (lsp lsp-deferred)
+  :hook (go-mode . lsp-deferred))
+
+(defun lsp-go-install-save-hooks ()
+  (add-hook 'before-save-hook #'lsp-format-buffer t t)
+  (add-hook 'before-save-hook #'lsp-organize-imports t t))
+(add-hook 'go-mode-hook #'lsp-go-install-save-hooks)
+
+;; Optional - provides fancier overlays.
+(use-package lsp-ui
+  :ensure t
+  :commands lsp-ui-mode)
+
+;; Company mode is a standard completion package that works well with lsp-mode.
+(use-package company
+  :ensure t
+  :config
+  ;; Optionally enable completion-as-you-type behavior.
+  (setq company-idle-delay 0)
+  (setq company-minimum-prefix-length 1))
 
-;; (require-package 'protobuf-mode)
-;; (defconst protobuf-style
-;;   '((c-basic-offset . 2)
-;;     (indent-tabs-mode . nil)))
+;; company-lsp integrates company mode completion with lsp-mode.
+;; completion-at-point also works out of the box but doesn't support snippets.
+(use-package company-lsp
+  :ensure t
+  :commands company-lsp)
 
-;; (add-hook 'protobuf-mode-hook
-;;           (lambda () (c-add-style "my-style" protobuf-style t)))
+;; Optional - provides snippet support.
+(use-package yasnippet
+  :ensure t
+  :commands yas-minor-mode
+  :hook (go-mode . yas-minor-mode))
 
 (provide 'init-go)

Diff for: lisp/init-omnisharp.el

@@ -4,7 +4,7 @@
 (if (eq system-type 'windows-nt)
     (setq omnisharp-server-executable-path "C:\\emacs_x64\\packages\\omnisharp-roslyn\\OmniSharp.exe"))
 (if (eq system-type 'darwin)
-    (setq omnisharp-server-executable-path "/usr/local/share/omnisharp-osx/run"))
+    (setq omnisharp-server-executable-path "/usr/local/opt/omnisharp-osx/run"))
 (if (eq system-type 'gnu/linux)
     (setq omnisharp-server-executable-path "/opt/omnisharp-linux/run"))
 
@@ -22,8 +22,7 @@
   (setq evil-shift-width 4)
   (setq company-minimum-prefix-length 3)
   (setq company-echo-delay 0)
-  (setq highlight-indent-guides-method 'character)
-  (add-to-list 'company-backends '(company-yasnippet company-omnisharp))
+  (add-to-list 'company-backends '(company-omnisharp :with :separate company-yasnippet))
   (define-key omnisharp-mode-map (kbd "C-c C-j") 'omnisharp-go-to-definition)
   (define-key omnisharp-mode-map (kbd "<f12>") 'omnisharp-go-to-definition)
   (define-key omnisharp-mode-map (kbd "C-c C-b") 'pop-tag-mark)

Diff for: lisp/init-packages.el

@@ -39,8 +39,7 @@
 			    sql-indent
 			    dotnet
 			    iedit
-			    color-theme-sanityinc-tomorrow
-			    color-theme-sanityinc-solarized
+			    use-package
 			    ) "Default packages")
 (setq package-selected-packages frankwan/packages)
 
@@ -78,4 +77,6 @@
 
 (require 'iedit)
 
+(require 'use-package)
+
 (provide 'init-packages)

Diff for: lisp/init-usepackage.el

@@ -0,0 +1,3 @@
+
+
+(provide 'use-package)

Diff for: snippets/csharp-mode/rfiled.snippet renamed to snippets/csharp-mode/filedreadonly.snippet

@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: readonly filed
-# key: rfiled
+# key: filedreadonly
 # --
 private readonly $1 _$0;