Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

## Unreleased

### Features/Changes
- Implement "Run in terminal"

### Bug Fixes
- Fix markdown syntax highlighting
- Fix click issue on window error message

## 0.4.1

### Features/Changes
- Add fedora builds
- Finish tree sitter dynamic libary support by downloading from https://github.com/lapce/tree-sitter-grammars
Expand Down
52 changes: 29 additions & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ path = "lapce-proxy/src/bin/lapce-proxy.rs"
members = ["lapce-app", "lapce-proxy", "lapce-rpc", "lapce-core"]

[workspace.package]
version = "0.4.0"
version = "0.4.1"
edition = "2021"
rust-version = "1.77.0"
license = "Apache-2.0"
Expand All @@ -34,7 +34,7 @@ authors = ["Dongdong Zhou <dzhou121@gmail.com>"]
anyhow = { version = "1.0" }
backtrace = { version = "0.3" }
chrono = { version = "0.4" }
clap = { version = "4.5.0", default-features = false, features = ["std", "help", "usage", "derive"] }
clap = { version = "4.5.15", default-features = false, features = ["std", "help", "usage", "derive"] }
crossbeam-channel = { version = "0.5.12" }
directories = { version = "4.0.1" }
flate2 = { version = "1.0" }
Expand Down Expand Up @@ -76,9 +76,9 @@ lapce-core = { path = "./lapce-core" }
lapce-rpc = { path = "./lapce-rpc" }
lapce-proxy = { path = "./lapce-proxy" }

floem = { git = "https://github.com/lapce/floem", rev = "54f0d1bcf0e1a91d82492ee7300a526adb60eb5c", features = ["editor", "serde", "default-image-formats", "rfd-async-std"] }
floem = { git = "https://github.com/lapce/floem", rev = "a207ef4bd463d41be1d06daeae3be7936b0dbb60", features = ["editor", "serde", "default-image-formats", "rfd-async-std"] }
# floem = { path = "../floem", features = ["editor", "serde", "default-image-formats", "rfd-async-std"] }
floem-editor-core = { git = "https://github.com/lapce/floem", rev = "54f0d1bcf0e1a91d82492ee7300a526adb60eb5c", features = ["serde"] }
floem-editor-core = { git = "https://github.com/lapce/floem", rev = "a207ef4bd463d41be1d06daeae3be7936b0dbb60", features = ["serde"] }
# floem-editor-core = { path = "../floem/editor-core/", features = ["serde"] }

[patch.crates-io]
Expand Down
8 changes: 8 additions & 0 deletions defaults/dark-theme.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,14 @@ dim-text = "#5C6370"
"variable.other.member" = "$red"
"tag" = "$blue"

"markup.heading" = "$red"
"markup.bold" = "$orange"
"markup.italic" = "$orange"
"markup.list" = "$orange"
"markup.link.url" = "$blue"
"markup.link.label" = "$purple"
"markup.link.text" = "$purple"

"bracket.color.1" = "$blue"
"bracket.color.2" = "$yellow"
"bracket.color.3" = "$purple"
Expand Down
8 changes: 8 additions & 0 deletions defaults/light-theme.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@ dim-text = "#A0A1A7"
"variable.other.member" = "$red"
"tag" = "$blue"

"markup.heading" = "$red"
"markup.bold" = "$orange"
"markup.italic" = "$orange"
"markup.list" = "$orange"
"markup.link.url" = "$blue"
"markup.link.label" = "$purple"
"markup.link.text" = "$purple"

"bracket.color.1" = "$blue"
"bracket.color.2" = "$yellow"
"bracket.color.3" = "$purple"
Expand Down
2 changes: 1 addition & 1 deletion extra/linux/dev.lapce.lapce.metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
</screenshot>
</screenshots>
<releases>
<release version="0.4.0" date="2024-04-24"/>
<release version="0.4.1" date="2024-08-07"/>
</releases>
</component>
2 changes: 1 addition & 1 deletion extra/macos/Lapce.app/Contents/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.4.0</string>
<string>0.4.1</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
Expand Down
2 changes: 1 addition & 1 deletion extra/windows/wix/lapce.wxs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="windows-1252"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product Name="Lapce" Id="*" UpgradeCode="9c09a374-1135-4782-959f-2dec376a1dfa" Language="1033" Codepage="1252" Version="0.4.0" Manufacturer="Lapce">
<Product Name="Lapce" Id="*" UpgradeCode="9c09a374-1135-4782-959f-2dec376a1dfa" Language="1033" Codepage="1252" Version="0.4.1" Manufacturer="Lapce">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/>
<MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A newer version of [ProductName] is already installed."/>
<Icon Id="lapce.exe" SourceFile=".\extra\windows\lapce.ico"/>
Expand Down
12 changes: 9 additions & 3 deletions lapce-app/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2795,10 +2795,10 @@ fn window_message_view(
}),
stack((
text(title.clone()).style(|s| {
s.min_width(0.0).line_height(1.6).font_weight(Weight::BOLD)
s.min_width(0.0).line_height(1.8).font_weight(Weight::BOLD)
}),
text(message.message.clone()).style(|s| {
s.min_width(0.0).line_height(1.6).margin_top(5.0)
s.min_width(0.0).line_height(1.8).margin_top(5.0)
}),
))
.style(move |s| {
Expand All @@ -2818,6 +2818,7 @@ fn window_message_view(
)
.style(|s| s.margin_left(6.0)),
))
.on_event_stop(EventListener::PointerDown, |_| {})
.style(move |s| {
let config = config.get();
s.width_full()
Expand Down Expand Up @@ -2846,7 +2847,11 @@ fn window_message_view(
.style(|s| s.flex_col().width_full()),
)
.style(|s| {
s.absolute().width_full().min_height(0.0).max_height_full()
s.absolute()
.width_full()
.min_height(0.0)
.max_height_full()
.set(PropagatePointerWheel, false)
}),
)
.style(|s| s.size_full()),
Expand Down Expand Up @@ -2930,6 +2935,7 @@ fn hover(window_tab_data: Rc<WindowTabData>) -> impl View {
layout_rect.set(rect);
})
.on_event_stop(EventListener::PointerMove, |_| {})
.on_event_stop(EventListener::PointerDown, |_| {})
.style(move |s| {
let active = window_tab_data.common.hover.active.get();
if !active {
Expand Down
4 changes: 4 additions & 0 deletions lapce-app/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,10 @@ pub enum LapceWorkbenchCommand {
#[strum(message = "Reveal in File Tree")]
RevealInFileTree,

#[strum(serialize = "run_in_terminal")]
#[strum(message = "Run in Terminal")]
RunInTerminal,

#[strum(serialize = "reveal_active_file_in_file_explorer")]
#[strum(message = "Reveal Active File in File Explorer")]
RevealActiveFileInFileExplorer,
Expand Down
Loading