diff --git a/data/core/syntax.lua b/data/core/syntax.lua index de8ec9d0..adecd0cd 100644 --- a/data/core/syntax.lua +++ b/data/core/syntax.lua @@ -3,7 +3,7 @@ local common = require "core.common" local syntax = {} syntax.items = {} -local plain_text_syntax = { patterns = {}, symbols = {} } +local plain_text_syntax = { name = "Plain Text", patterns = {}, symbols = {} } function syntax.add(t) diff --git a/data/plugins/language_md.lua b/data/plugins/language_md.lua index 62cb8a86..e7c870ec 100644 --- a/data/plugins/language_md.lua +++ b/data/plugins/language_md.lua @@ -9,7 +9,6 @@ syntax.add { patterns = { { pattern = "\\.", type = "normal" }, { pattern = { "" }, type = "comment" }, - { pattern = { "```c", "```" }, type = "string", syntax = ".c" }, { pattern = { "```c++", "```" }, type = "string", syntax = ".cpp" }, { pattern = { "```python", "```" }, type = "string", syntax = ".py" }, { pattern = { "```ruby", "```" }, type = "string", syntax = ".rb" }, @@ -26,6 +25,21 @@ syntax.add { { pattern = { "```cmake", "```" }, type = "string", syntax = ".cmake" }, { pattern = { "```d", "```" }, type = "string", syntax = ".d" }, { 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" }, diff --git a/data/plugins/treeview.lua b/data/plugins/treeview.lua index 2e66083a..4f5db701 100644 --- a/data/plugins/treeview.lua +++ b/data/plugins/treeview.lua @@ -406,7 +406,7 @@ function RootView:draw(...) end local function is_project_folder(path) - return common.basename(core.project_dir) == path + return core.project_dir == path end menu:register(function() return view.hovered_item end, { @@ -417,7 +417,7 @@ menu:register(function() return view.hovered_item end, { menu:register( function() return view.hovered_item - and not is_project_folder(view.hovered_item.filename) + and not is_project_folder(view.hovered_item.abs_filename) end, { { text = "Rename", command = "treeview:rename" }, @@ -467,9 +467,8 @@ command.add(function() return view.hovered_item ~= nil end, { end, ["treeview:new-file"] = function() - local dir_name = view.hovered_item.filename - if not is_project_folder(dir_name) then - core.command_view:set_text(dir_name .. "/") + if not is_project_folder(view.hovered_item.abs_filename) then + core.command_view:set_text(view.hovered_item.filename .. "/") end core.command_view:enter("Filename", function(filename) local doc_filename = core.project_dir .. PATHSEP .. filename @@ -482,9 +481,8 @@ command.add(function() return view.hovered_item ~= nil end, { end, ["treeview:new-folder"] = function() - local dir_name = view.hovered_item.filename - if not is_project_folder(dir_name) then - core.command_view:set_text(dir_name .. "/") + if not is_project_folder(view.hovered_item.abs_filename) then + core.command_view:set_text(view.hovered_item.filename .. "/") end core.command_view:enter("Folder Name", function(filename) local dir_path = core.project_dir .. PATHSEP .. filename