Merge branch 'main' of https://gitea.safemind.net/mathias/nvim-kickstart
commit
04f1abe4d1
|
|
@ -158,8 +158,16 @@ setup_server("intelephense", {
|
||||||
init_options = {
|
init_options = {
|
||||||
licenceKey = (function()
|
licenceKey = (function()
|
||||||
local license_path = vim.fn.expand("$HOME/.config/intelephense/license.txt")
|
local license_path = vim.fn.expand("$HOME/.config/intelephense/license.txt")
|
||||||
|
<<<<<<< HEAD
|
||||||
if vim.fn.filereadable(license_path) == 1 then
|
if vim.fn.filereadable(license_path) == 1 then
|
||||||
return vim.fn.readfile(license_path)[1]
|
return vim.fn.readfile(license_path)[1]
|
||||||
|
=======
|
||||||
|
local file = io.open(license_path, "r")
|
||||||
|
if file then
|
||||||
|
local content = file:read("*l") -- read first line
|
||||||
|
file:close()
|
||||||
|
return content
|
||||||
|
>>>>>>> fbcc0b8d619e6f84448645f49d0a1dda9de840e5
|
||||||
end
|
end
|
||||||
return nil
|
return nil
|
||||||
end)(),
|
end)(),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue