From 3128bcd2bc829df03d00444837d21e6704ecc3b5 Mon Sep 17 00:00:00 2001 From: Steve Matney Date: Sun, 4 Oct 2020 20:54:21 -0600 Subject: [PATCH 1/2] Limiting the scope of after/indent/typescriptreact.vim, after/indent/typescript.vim, after/indent/javascriptreact.vim, and jsx.vim * Not pulling in every indent/javascript.vim file. * Resolves #75 * Resolves #76 --- after/indent/javascriptreact.vim | 2 +- after/indent/jsx.vim | 2 +- after/indent/typescript.vim | 2 +- after/indent/typescriptreact.vim | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/after/indent/javascriptreact.vim b/after/indent/javascriptreact.vim index 253d15b..f9c0eda 100644 --- a/after/indent/javascriptreact.vim +++ b/after/indent/javascriptreact.vim @@ -1 +1 @@ -runtime! indent/javascript.vim +source :p:h/javascript.vim diff --git a/after/indent/jsx.vim b/after/indent/jsx.vim index 253d15b..f9c0eda 100644 --- a/after/indent/jsx.vim +++ b/after/indent/jsx.vim @@ -1 +1 @@ -runtime! indent/javascript.vim +source :p:h/javascript.vim diff --git a/after/indent/typescript.vim b/after/indent/typescript.vim index 253d15b..f9c0eda 100644 --- a/after/indent/typescript.vim +++ b/after/indent/typescript.vim @@ -1 +1 @@ -runtime! indent/javascript.vim +source :p:h/javascript.vim diff --git a/after/indent/typescriptreact.vim b/after/indent/typescriptreact.vim index 253d15b..f9c0eda 100644 --- a/after/indent/typescriptreact.vim +++ b/after/indent/typescriptreact.vim @@ -1 +1 @@ -runtime! indent/javascript.vim +source :p:h/javascript.vim From 5539c6162be5d4f5b3a11ccf7cf615cb978986f6 Mon Sep 17 00:00:00 2001 From: Steve Matney Date: Sun, 4 Oct 2020 21:10:34 -0600 Subject: [PATCH 2/2] Limiting scope of all the files, when referencing other plugin files. --- after/ftplugin/javascriptreact.vim | 2 +- after/ftplugin/typescript.vim | 2 +- after/ftplugin/typescriptreact.vim | 2 +- after/syntax/javascriptreact.vim | 2 +- after/syntax/typescript.vim | 2 +- after/syntax/typescriptreact.vim | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/after/ftplugin/javascriptreact.vim b/after/ftplugin/javascriptreact.vim index 63daad1..f9c0eda 100644 --- a/after/ftplugin/javascriptreact.vim +++ b/after/ftplugin/javascriptreact.vim @@ -1 +1 @@ -runtime! ftplugin/javascript.vim +source :p:h/javascript.vim diff --git a/after/ftplugin/typescript.vim b/after/ftplugin/typescript.vim index 63daad1..f9c0eda 100644 --- a/after/ftplugin/typescript.vim +++ b/after/ftplugin/typescript.vim @@ -1 +1 @@ -runtime! ftplugin/javascript.vim +source :p:h/javascript.vim diff --git a/after/ftplugin/typescriptreact.vim b/after/ftplugin/typescriptreact.vim index c23ec13..826e776 100644 --- a/after/ftplugin/typescriptreact.vim +++ b/after/ftplugin/typescriptreact.vim @@ -1 +1 @@ -runtime! ftplugin/typescript.vim +source :p:h/typescript.vim diff --git a/after/syntax/javascriptreact.vim b/after/syntax/javascriptreact.vim index b5b557c..f9c0eda 100644 --- a/after/syntax/javascriptreact.vim +++ b/after/syntax/javascriptreact.vim @@ -1 +1 @@ -runtime! syntax/javascript.vim +source :p:h/javascript.vim diff --git a/after/syntax/typescript.vim b/after/syntax/typescript.vim index 50bf96b..8568d43 100644 --- a/after/syntax/typescript.vim +++ b/after/syntax/typescript.vim @@ -1,4 +1,4 @@ -runtime! syntax/javascript.vim +source :p:h/javascript.vim " define custom API section, that contains typescript annotations " this is structurally similar to `jsFuncCall`, but allows type diff --git a/after/syntax/typescriptreact.vim b/after/syntax/typescriptreact.vim index 8fc4480..826e776 100644 --- a/after/syntax/typescriptreact.vim +++ b/after/syntax/typescriptreact.vim @@ -1 +1 @@ -runtime! syntax/typescript.vim +source :p:h/typescript.vim