summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ftplugin/html.lua1
-rw-r--r--ftplugin/javascriptreact.lua1
-rw-r--r--ftplugin/svelte.lua1
-rw-r--r--ftplugin/typescriptreact.lua1
-rw-r--r--ftplugin/vue.lua1
-rw-r--r--lua/config/defaults.lua18
-rw-r--r--lua/lsp/init.lua2
7 files changed, 15 insertions, 10 deletions
diff --git a/ftplugin/html.lua b/ftplugin/html.lua
index c60394c0..c85374dd 100644
--- a/ftplugin/html.lua
+++ b/ftplugin/html.lua
@@ -1 +1,2 @@
require("lsp").setup "html"
+require("lsp").setup "tailwindcss"
diff --git a/ftplugin/javascriptreact.lua b/ftplugin/javascriptreact.lua
index 90920166..370b09ba 100644
--- a/ftplugin/javascriptreact.lua
+++ b/ftplugin/javascriptreact.lua
@@ -1 +1,2 @@
require("lsp").setup "javascriptreact"
+require("lsp").setup "tailwindcss"
diff --git a/ftplugin/svelte.lua b/ftplugin/svelte.lua
index 175a5cbd..a8a8a8d1 100644
--- a/ftplugin/svelte.lua
+++ b/ftplugin/svelte.lua
@@ -1 +1,2 @@
require("lsp").setup "svelte"
+require("lsp").setup "tailwindcss"
diff --git a/ftplugin/typescriptreact.lua b/ftplugin/typescriptreact.lua
index 2f6219df..6c65ddc5 100644
--- a/ftplugin/typescriptreact.lua
+++ b/ftplugin/typescriptreact.lua
@@ -1 +1,2 @@
require("lsp").setup "typescript"
+require("lsp").setup "tailwindcss"
diff --git a/ftplugin/vue.lua b/ftplugin/vue.lua
index a174c9bf..b2a560d9 100644
--- a/ftplugin/vue.lua
+++ b/ftplugin/vue.lua
@@ -1 +1,2 @@
require("lsp").setup "vue"
+require("lsp").setup "tailwindcss"
diff --git a/lua/config/defaults.lua b/lua/config/defaults.lua
index 4f538dbb..eb8726fa 100644
--- a/lua/config/defaults.lua
+++ b/lua/config/defaults.lua
@@ -948,15 +948,15 @@ lvim.lang = {
},
},
tailwindcss = {
- active = false,
- filetypes = {
- "html",
- "css",
- "scss",
- "javascript",
- "javascriptreact",
- "typescript",
- "typescriptreact",
+ lsp = {
+ active = false,
+ provider = "tailwindcss",
+ setup = {
+ cmd = {
+ DATA_PATH .. "/lspinstall/tailwindcss/tailwindcss-intellisense.sh",
+ "--stdio",
+ },
+ },
},
},
terraform = {
diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua
index 1e1ff22e..b43bd419 100644
--- a/lua/lsp/init.lua
+++ b/lua/lsp/init.lua
@@ -125,7 +125,7 @@ end
function M.setup(lang)
local lsp_utils = require "lsp.utils"
local lsp = lvim.lang[lang].lsp
- if lsp_utils.is_client_active(lsp.provider) then
+ if (lsp.active ~= nil and not lsp.active) or lsp_utils.is_client_active(lsp.provider) then
return
end