From 664aa988f6d9cdb7b75218666fbe348c85ef8b29 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 4 Sep 2019 15:44:43 +0200
Subject: Update

---
 after/ftplugin/javascript.vim | 6 +++++-
 after/ftplugin/typescript.vim | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'after/ftplugin')

diff --git a/after/ftplugin/javascript.vim b/after/ftplugin/javascript.vim
index 093f0b7b..4a6346d9 100644
--- a/after/ftplugin/javascript.vim
+++ b/after/ftplugin/javascript.vim
@@ -83,6 +83,10 @@ fu! IsStyledDefinition(lnum)
 endfu
 
 if exists('&ofu')
-  let b:prevofu=&ofu
+  if &ofu
+    " Do not keep track of previous omnifunc if it was not set in the first
+    " place
+    let b:prevofu=&ofu
+  endif
   setl omnifunc=styledcomplete#CompleteSC
 endif
diff --git a/after/ftplugin/typescript.vim b/after/ftplugin/typescript.vim
index 29ac50a6..21da03be 100644
--- a/after/ftplugin/typescript.vim
+++ b/after/ftplugin/typescript.vim
@@ -25,3 +25,7 @@ augroup jsx_comment
 augroup end
 
 setlocal suffixesadd+=.tsx
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'styled-components') != -1
+  finish
+endif
+
-- 
cgit v1.2.3