Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
vyskocilm authored Oct 24, 2024
2 parents 199bff3 + 9bfa4e9 commit b64972b
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2024 mistweaver.co
Copyright (c) 2024+ mistweaverco

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ See [configuration options](https://kulala.mwco.app/docs/getting-started/configu

For getting this project started.

This project was heaviliy inspired by the idea of having a REST client in Neovim.
This project was heavily inspired by the idea of having a REST client in Neovim.

The actual state of [rest.nvim](https://github.com/rest-nvim/rest.nvim)
as archived kicked off the development of kulala.nvim.
Expand Down
5 changes: 3 additions & 2 deletions docs/docs/getting-started/configuration-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ the Kulala plugin with the available `opts`:
winbar = false,

-- Specify the panes to be displayed by default
-- Current avaliable pane contains { "body", "headers", "headers_body", "script_output" },
-- Current available pane contains { "body", "headers", "headers_body", "script_output", "stats" },
default_winbar_panes = { "body", "headers", "headers_body" },

-- enable reading vscode rest client environment variables
Expand Down Expand Up @@ -157,6 +157,7 @@ Possible values:
- `headers`
- `headers_body`
- `script_output`
- `stats`

Default: `body`

Expand Down Expand Up @@ -341,7 +342,7 @@ Possible values:
- You can use an external program which receives the
full body as stdin and has to return the selected value in stdout.
The placeholder `{{path}}` can be used in any string of
this defintion and will be replaced by the actual path (after `body.`).
this definition and will be replaced by the actual path (after `body.`).
- Alternative you can give a lua function of `value = function(body, path)`.

Default:
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/usage/authentication.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ GET https://www/api HTTP/1.1
Authorization: Basic TXlVc2VyOlByaXZhdGU=
```

Futhermore you can enter username and password in
Furthermore you can enter username and password in
plain text in the `Authorization` header field,
Kulala will automatically encode it for you.

Expand Down
2 changes: 1 addition & 1 deletion docs/docusaurus.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ const config: Config = {
],
},
],
copyright: `Copyright © ${new Date().getFullYear()} mistweaver.co.`,
copyright: `Copyright © ${new Date().getFullYear()} mistweaverco.`,
},
prism: {
theme: prismThemes.github,
Expand Down
2 changes: 1 addition & 1 deletion lua/kulala/config/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ M.defaults = {
-- enable winbar
winbar = false,
-- Specify the panes to be displayed by default
-- Current avaliable pane contains { "body", "headers", "headers_body", "script_output" },
-- Current available pane contains { "body", "headers", "headers_body", "script_output", "stats" },
default_winbar_panes = { "body", "headers", "headers_body" },
-- enable reading vscode rest client environment variables
vscode_rest_client_environmentvars = false,
Expand Down
2 changes: 1 addition & 1 deletion lua/kulala/parser/env.lua
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ M.get_env = function()
if dotenv then
local dotenv_env = vim.fn.readfile(dotenv)
for _, line in ipairs(dotenv_env) do
-- if the line is not empy and not a comment, then
-- if the line is not empty and not a comment, then
if not line:match("^%s*$") and not line:match("^%s*#") then
local key, value = line:match("^%s*([^=]+)%s*=%s*(.*)%s*$")
if key and value then
Expand Down
2 changes: 1 addition & 1 deletion lua/kulala/parser/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ M.parse = function(start_request_linenr)
replace_variables_in_url_headers_body(res, document_variables, env, false)
end

-- build the command to exectute the request
-- build the command to execute the request
table.insert(res.cmd, CONFIG.get().curl_path)
table.insert(res.cmd, "-s")
table.insert(res.cmd, "-D")
Expand Down
2 changes: 1 addition & 1 deletion lua/kulala/ui/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ end
local open_buffer = function()
local prev_win = vim.api.nvim_get_current_win()
local sd = CONFIG.get().split_direction == "vertical" and "vsplit" or "split"
vim.cmd(sd .. " " .. GLOBALS.UI_ID)
vim.cmd("keepalt " .. sd .. " " .. GLOBALS.UI_ID)
if CONFIG.get().winbar then
WINBAR.create_winbar(get_win())
end
Expand Down

0 comments on commit b64972b

Please sign in to comment.