walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 17 Wiki Activity

Merge branch 'lite-xl:master' into lite-xl-windows-dark-theme-title-bar-support

This commit is contained in:
Nikolai Sinyov 2021-12-05 23:20:53 +03:00 committed by GitHub
parent be664b268d 2997aa2652
commit 8b41f8c478
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/core/syntax.lua
View File

@ -3,7 +3,7 @@ local common = require "core.common"
local syntax = {} local syntax = {}
syntax.items = {} syntax.items = {}
local plain_text_syntax = { patterns = {}, symbols = {} } local plain_text_syntax = { name = "Plain Text", patterns = {}, symbols = {} }
function syntax.add(t) function syntax.add(t)

16
data/plugins/language_md.lua
View File

@ -9,7 +9,6 @@ syntax.add {
patterns = { patterns = {
{ pattern = "\\.", type = "normal" }, { pattern = "\\.", type = "normal" },
{ pattern = { "<!%-%-", "%-%->" }, type = "comment" }, { pattern = { "<!%-%-", "%-%->" }, type = "comment" },
{ pattern = { "```c", "```" }, type = "string", syntax = ".c" },
{ pattern = { "```c++", "```" }, type = "string", syntax = ".cpp" }, { pattern = { "```c++", "```" }, type = "string", syntax = ".cpp" },
{ pattern = { "```python", "```" }, type = "string", syntax = ".py" }, { pattern = { "```python", "```" }, type = "string", syntax = ".py" },
{ pattern = { "```ruby", "```" }, type = "string", syntax = ".rb" }, { pattern = { "```ruby", "```" }, type = "string", syntax = ".rb" },
@ -26,6 +25,21 @@ syntax.add {
{ pattern = { "```cmake", "```" }, type = "string", syntax = ".cmake" }, { pattern = { "```cmake", "```" }, type = "string", syntax = ".cmake" },
{ pattern = { "```d", "```" }, type = "string", syntax = ".d" }, { pattern = { "```d", "```" }, type = "string", syntax = ".d" },
{ pattern = { "```glsl", "```" }, type = "string", syntax = ".glsl" }, { pattern = { "```glsl", "```" }, type = "string", syntax = ".glsl" },
{ pattern = { "```c", "```" }, type = "string", syntax = ".c" },
{ pattern = { "```julia", "```" }, type = "string", syntax = ".jl" },
{ pattern = { "```rust", "```" }, type = "string", syntax = ".rs" },
{ pattern = { "```dart", "```" }, type = "string", syntax = ".dart" },
{ pattern = { "```v", "```" }, type = "string", syntax = ".v" },
{ pattern = { "```toml", "```" }, type = "string", syntax = ".toml" },
{ pattern = { "```yaml", "```" }, type = "string", syntax = ".yaml" },
{ pattern = { "```php", "```" }, type = "string", syntax = ".php" },
{ pattern = { "```nim", "```" }, type = "string", syntax = ".nim" },
{ pattern = { "```typescript", "```" }, type = "string", syntax = ".ts" },
{ pattern = { "```rescript", "```" }, type = "string", syntax = ".res" },
{ pattern = { "```moon", "```" }, type = "string", syntax = ".moon" },
{ pattern = { "```go", "```" }, type = "string", syntax = ".go" },
{ pattern = { "```lobster", "```" }, type = "string", syntax = ".lobster" },
{ pattern = { "```liquid", "```" }, type = "string", syntax = ".liquid" },
{ pattern = { "```", "```" }, type = "string" }, { pattern = { "```", "```" }, type = "string" },
{ pattern = { "``", "``", "\\" }, type = "string" }, { pattern = { "``", "``", "\\" }, type = "string" },
{ pattern = { "`", "`", "\\" }, type = "string" }, { pattern = { "`", "`", "\\" }, type = "string" },

14
data/plugins/treeview.lua
View File

@ -406,7 +406,7 @@ function RootView:draw(...)
end end
local function is_project_folder(path) local function is_project_folder(path)
return common.basename(core.project_dir) == path return core.project_dir == path
end end
menu:register(function() return view.hovered_item end, { menu:register(function() return view.hovered_item end, {
@ -417,7 +417,7 @@ menu:register(function() return view.hovered_item end, {
menu:register( menu:register(
function() function()
return view.hovered_item return view.hovered_item
and not is_project_folder(view.hovered_item.filename) and not is_project_folder(view.hovered_item.abs_filename)
end, end,
{ {
{ text = "Rename", command = "treeview:rename" }, { text = "Rename", command = "treeview:rename" },
@ -467,9 +467,8 @@ command.add(function() return view.hovered_item ~= nil end, {
end, end,
["treeview:new-file"] = function() ["treeview:new-file"] = function()
local dir_name = view.hovered_item.filename if not is_project_folder(view.hovered_item.abs_filename) then
if not is_project_folder(dir_name) then core.command_view:set_text(view.hovered_item.filename .. "/")
core.command_view:set_text(dir_name .. "/")
end end
core.command_view:enter("Filename", function(filename) core.command_view:enter("Filename", function(filename)
local doc_filename = core.project_dir .. PATHSEP .. filename local doc_filename = core.project_dir .. PATHSEP .. filename
@ -482,9 +481,8 @@ command.add(function() return view.hovered_item ~= nil end, {
end, end,
["treeview:new-folder"] = function() ["treeview:new-folder"] = function()
local dir_name = view.hovered_item.filename if not is_project_folder(view.hovered_item.abs_filename) then
if not is_project_folder(dir_name) then core.command_view:set_text(view.hovered_item.filename .. "/")
core.command_view:set_text(dir_name .. "/")
end end
core.command_view:enter("Folder Name", function(filename) core.command_view:enter("Folder Name", function(filename)
local dir_path = core.project_dir .. PATHSEP .. filename local dir_path = core.project_dir .. PATHSEP .. filename