Merge branch 'main' into in-app-feedback

This commit is contained in:
Joseph Lyons 2023-01-23 18:24:12 -05:00
commit 8e8f66a5e1
69 changed files with 246 additions and 61 deletions

View File

@ -41,16 +41,19 @@ jobs:
with:
clean: false
submodules: 'recursive'
- name: Run tests
run: cargo test --workspace --no-fail-fast
- name: Build collab
run: cargo build -p collab
- name: Build other binaries
run: cargo build --workspace --bins --all-features
- name: Generate license file
run: script/generate-licenses
bundle:
name: Bundle app
runs-on:
@ -109,6 +112,9 @@ jobs:
exit 1
fi
- name: Generate license file
run: script/generate-licenses
- name: Create app bundle
run: script/bundle

1
.gitignore vendored
View File

@ -9,6 +9,7 @@
/assets/themes/*.json
/assets/themes/Internal/*.json
/assets/themes/Experiments/*.json
/assets/licenses.md
**/venv
.build
Packages

View File

@ -2,6 +2,7 @@
name = "activity_indicator"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/activity_indicator.rs"

View File

@ -2,6 +2,7 @@
name = "assets"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/assets.rs"

View File

@ -2,6 +2,7 @@
name = "auto_update"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/auto_update.rs"

View File

@ -2,6 +2,7 @@
name = "breadcrumbs"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/breadcrumbs.rs"

View File

@ -2,6 +2,7 @@
name = "call"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/call.rs"

View File

@ -2,6 +2,7 @@
name = "cli"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/cli.rs"

View File

@ -9,7 +9,13 @@ use core_foundation::{
use core_services::{kLSLaunchDefaults, LSLaunchURLSpec, LSOpenFromURLSpec, TCFType};
use ipc_channel::ipc::{IpcOneShotServer, IpcReceiver, IpcSender};
use serde::Deserialize;
use std::{ffi::OsStr, fs, path::PathBuf, ptr};
use std::{
ffi::OsStr,
fs::{self, OpenOptions},
io,
path::{Path, PathBuf},
ptr,
};
#[derive(Parser)]
#[clap(name = "zed", global_setting(clap::AppSettings::NoAutoVersion))]
@ -54,6 +60,12 @@ fn main() -> Result<()> {
return Ok(());
}
for path in args.paths.iter() {
if !path.exists() {
touch(path.as_path())?;
}
}
let (tx, rx) = launch_app(bundle_path)?;
tx.send(CliRequest::Open {
@ -77,6 +89,13 @@ fn main() -> Result<()> {
Ok(())
}
fn touch(path: &Path) -> io::Result<()> {
match OpenOptions::new().create(true).write(true).open(path) {
Ok(_) => Ok(()),
Err(e) => Err(e),
}
}
fn locate_bundle() -> Result<PathBuf> {
let cli_path = std::env::current_exe()?.canonicalize()?;
let mut app_path = cli_path.clone();

View File

@ -2,6 +2,7 @@
name = "client"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/client.rs"

View File

@ -2,6 +2,7 @@
name = "clock"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/clock.rs"

View File

@ -4,6 +4,7 @@ default-run = "collab"
edition = "2021"
name = "collab"
version = "0.5.3"
publish = false
[[bin]]
name = "collab"

View File

@ -2,6 +2,7 @@
name = "collab_ui"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/collab_ui.rs"

View File

@ -2,6 +2,7 @@
name = "collections"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/collections.rs"

View File

@ -2,6 +2,7 @@
name = "command_palette"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/command_palette.rs"

View File

@ -2,6 +2,7 @@
name = "context_menu"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/context_menu.rs"

View File

@ -2,6 +2,7 @@
name = "db"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/db.rs"

View File

@ -2,6 +2,7 @@
name = "diagnostics"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/diagnostics.rs"

View File

@ -2,6 +2,7 @@
name = "drag_and_drop"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/drag_and_drop.rs"

View File

@ -2,6 +2,7 @@
name = "editor"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/editor.rs"

View File

@ -2,6 +2,7 @@
name = "file_finder"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/file_finder.rs"

View File

@ -2,6 +2,7 @@
name = "fs"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/fs.rs"

View File

@ -3,6 +3,7 @@ name = "fsevent"
version = "2.0.2"
license = "MIT"
edition = "2021"
publish = false
[lib]
path = "src/fsevent.rs"

View File

@ -2,6 +2,7 @@
name = "fuzzy"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/fuzzy.rs"

View File

@ -2,6 +2,7 @@
name = "git"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/git.rs"

View File

@ -2,6 +2,7 @@
name = "go_to_line"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/go_to_line.rs"

View File

@ -4,6 +4,7 @@ edition = "2021"
name = "gpui"
version = "0.1.0"
description = "A GPU-accelerated UI framework"
publish = false
[lib]
path = "src/gpui.rs"

View File

@ -2,6 +2,7 @@
name = "gpui_macros"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/gpui_macros.rs"

View File

@ -2,6 +2,7 @@
name = "journal"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/journal.rs"

View File

@ -2,6 +2,7 @@
name = "language"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/language.rs"

View File

@ -3,6 +3,7 @@ name = "live_kit_client"
version = "0.1.0"
edition = "2021"
description = "Bindings to LiveKit Swift client SDK"
publish = false
[lib]
path = "src/live_kit_client.rs"

View File

@ -3,6 +3,7 @@ name = "live_kit_server"
version = "0.1.0"
edition = "2021"
description = "SDK for the LiveKit server API"
publish = false
[lib]
path = "src/live_kit_server.rs"

View File

@ -2,6 +2,7 @@
name = "lsp"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/lsp.rs"

View File

@ -2,6 +2,7 @@
name = "media"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/media.rs"

View File

@ -2,6 +2,7 @@
name = "menu"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/menu.rs"

View File

@ -2,6 +2,7 @@
name = "outline"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/outline.rs"

View File

@ -2,6 +2,7 @@
name = "picker"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/picker.rs"

View File

@ -2,6 +2,7 @@
name = "plugin"
version = "0.1.0"
edition = "2021"
publish = false
[dependencies]
serde = "1.0"

View File

@ -2,6 +2,7 @@
name = "plugin_macros"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
proc-macro = true

View File

@ -2,6 +2,7 @@
name = "plugin_runtime"
version = "0.1.0"
edition = "2021"
publish = false
[dependencies]
wasmtime = "0.38"

View File

@ -2,6 +2,7 @@
name = "project"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/project.rs"

View File

@ -2,6 +2,7 @@
name = "project_panel"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/project_panel.rs"

View File

@ -2,6 +2,7 @@
name = "project_symbols"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/project_symbols.rs"

View File

@ -2,6 +2,7 @@
name = "recent_projects"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/recent_projects.rs"

View File

@ -2,6 +2,7 @@
name = "rope"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/rope.rs"

View File

@ -3,6 +3,7 @@ description = "Shared logic for communication between the Zed app and the zed.de
edition = "2021"
name = "rpc"
version = "0.1.0"
publish = false
[lib]
path = "src/rpc.rs"

View File

@ -2,6 +2,7 @@
name = "search"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/search.rs"

View File

@ -2,6 +2,7 @@
name = "settings"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/settings.rs"

View File

@ -2,6 +2,7 @@
name = "snippet"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/snippet.rs"

View File

@ -2,6 +2,7 @@
name = "sqlez"
version = "0.1.0"
edition = "2021"
publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View File

@ -2,6 +2,7 @@
name = "sqlez_macros"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/sqlez_macros.rs"

View File

@ -2,6 +2,7 @@
name = "sum_tree"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/sum_tree.rs"

View File

@ -2,6 +2,7 @@
name = "terminal"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/terminal.rs"

View File

@ -2,6 +2,7 @@
name = "terminal_view"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/terminal_view.rs"

View File

@ -2,6 +2,7 @@
name = "text"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/text.rs"

View File

@ -2,6 +2,7 @@
name = "theme"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/theme.rs"

View File

@ -2,6 +2,7 @@
name = "theme_selector"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/theme_selector.rs"

View File

@ -2,6 +2,7 @@
name = "theme_testbench"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/theme_testbench.rs"

View File

@ -2,6 +2,7 @@
name = "util"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
doctest = false

View File

@ -2,6 +2,7 @@
name = "vim"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/vim.rs"

View File

@ -2,6 +2,7 @@
name = "workspace"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/workspace.rs"

View File

@ -1150,7 +1150,7 @@ impl Pane {
row.add_child({
enum Tab {}
dragged_item_receiver::<Tab, _>(ix, ix, true, None, cx, {
let mut receiver = dragged_item_receiver::<Tab, _>(ix, ix, true, None, cx, {
let item = item.clone();
let pane = pane.clone();
let detail = detail.clone();
@ -1162,50 +1162,51 @@ impl Pane {
let hovered = mouse_state.hovered();
Self::render_tab(&item, pane, ix == 0, detail, hovered, tab_style, cx)
}
})
.with_cursor_style(if pane_active && tab_active {
CursorStyle::Arrow
} else {
CursorStyle::PointingHand
})
.on_down(MouseButton::Left, move |_, cx| {
cx.dispatch_action(ActivateItem(ix));
cx.propagate_event();
})
.on_click(MouseButton::Middle, {
let item = item.clone();
let pane = pane.clone();
move |_, cx: &mut EventContext| {
cx.dispatch_action(CloseItem {
item_id: item.id(),
pane: pane.clone(),
})
}
})
.as_draggable(
DraggedItem {
item,
pane: pane.clone(),
},
{
let theme = cx.global::<Settings>().theme.clone();
});
let detail = detail.clone();
move |dragged_item, cx: &mut RenderContext<Workspace>| {
let tab_style = &theme.workspace.tab_bar.dragged_tab;
Self::render_tab(
&dragged_item.item,
dragged_item.pane.clone(),
false,
detail,
false,
&tab_style,
cx,
)
if !pane_active || !tab_active {
receiver = receiver.with_cursor_style(CursorStyle::PointingHand);
}
receiver
.on_down(MouseButton::Left, move |_, cx| {
cx.dispatch_action(ActivateItem(ix));
cx.propagate_event();
})
.on_click(MouseButton::Middle, {
let item = item.clone();
let pane = pane.clone();
move |_, cx: &mut EventContext| {
cx.dispatch_action(CloseItem {
item_id: item.id(),
pane: pane.clone(),
})
}
},
)
.boxed()
})
.as_draggable(
DraggedItem {
item,
pane: pane.clone(),
},
{
let theme = cx.global::<Settings>().theme.clone();
let detail = detail.clone();
move |dragged_item, cx: &mut RenderContext<Workspace>| {
let tab_style = &theme.workspace.tab_bar.dragged_tab;
Self::render_tab(
&dragged_item.item,
dragged_item.pane.clone(),
false,
detail,
false,
&tab_style,
cx,
)
}
},
)
.boxed()
})
}

View File

@ -234,6 +234,7 @@ pub fn init(app_state: Arc<AppState>, cx: &mut MutableAppContext) {
workspace.toggle_sidebar(SidebarSide::Right, cx);
});
cx.add_action(Workspace::activate_pane_at_index);
cx.add_action(Workspace::split_pane_with_item);
cx.add_action(Workspace::split_pane_with_project_entry);

View File

@ -4,6 +4,7 @@ description = "The fast, collaborative code editor."
edition = "2021"
name = "zed"
version = "0.71.0"
publish = false
[lib]
name = "zed"

View File

@ -31,7 +31,7 @@ use search::{BufferSearchBar, ProjectSearchBar};
use serde::Deserialize;
use serde_json::to_string_pretty;
use settings::{keymap_file_json_schema, settings_file_json_schema, Settings};
use std::{env, path::Path, str, sync::Arc};
use std::{borrow::Cow, env, path::Path, str, sync::Arc};
use util::{channel::ReleaseChannel, paths, ResultExt};
pub use workspace;
use workspace::{sidebar::SidebarSide, AppState, Workspace};
@ -57,6 +57,7 @@ actions!(
DebugElements,
OpenSettings,
OpenLog,
OpenLicenses,
OpenTelemetryLog,
OpenKeymap,
OpenDefaultSettings,
@ -176,6 +177,19 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut gpui::MutableAppContext) {
open_log_file(workspace, app_state.clone(), cx);
}
});
cx.add_action({
let app_state = app_state.clone();
move |workspace: &mut Workspace, _: &OpenLicenses, cx: &mut ViewContext<Workspace>| {
open_bundled_file(
workspace,
app_state.clone(),
"licenses.md",
"Open Source License Attribution",
"Markdown",
cx,
);
}
});
cx.add_action({
let app_state = app_state.clone();
move |workspace: &mut Workspace, _: &OpenTelemetryLog, cx: &mut ViewContext<Workspace>| {
@ -191,11 +205,12 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut gpui::MutableAppContext) {
cx.add_action({
let app_state = app_state.clone();
move |workspace: &mut Workspace, _: &OpenDefaultKeymap, cx: &mut ViewContext<Workspace>| {
open_bundled_config_file(
open_bundled_file(
workspace,
app_state.clone(),
"keymaps/default.json",
"Default Key Bindings",
"JSON",
cx,
);
}
@ -205,11 +220,12 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut gpui::MutableAppContext) {
move |workspace: &mut Workspace,
_: &OpenDefaultSettings,
cx: &mut ViewContext<Workspace>| {
open_bundled_config_file(
open_bundled_file(
workspace,
app_state.clone(),
"settings/default.json",
"Default Settings",
"JSON",
cx,
);
}
@ -613,21 +629,24 @@ fn open_telemetry_log_file(
}).detach();
}
fn open_bundled_config_file(
fn open_bundled_file(
workspace: &mut Workspace,
app_state: Arc<AppState>,
asset_path: &'static str,
title: &'static str,
language: &'static str,
cx: &mut ViewContext<Workspace>,
) {
workspace
.with_local_workspace(&app_state, cx, |workspace, cx| {
let project = workspace.project().clone();
let buffer = project.update(cx, |project, cx| {
let text = Assets::get(asset_path).unwrap().data;
let text = Assets::get(asset_path)
.map(|f| f.data)
.unwrap_or_else(|| Cow::Borrowed(b"File not found"));
let text = str::from_utf8(text.as_ref()).unwrap();
project
.create_buffer(text, project.languages().get_language("JSON"), cx)
.create_buffer(text, project.languages().get_language(language), cx)
.expect("creating buffers on a local workspace always succeeds")
});
let buffer =

15
script/generate-licenses Executable file
View File

@ -0,0 +1,15 @@
#!/bin/bash
set -e
[[ "$(cargo about --version)" == "cargo-about 0.5.2" ]] || cargo install cargo-about --locked --git https://github.com/zed-industries/cargo-about --branch error-code-on-warn
cargo about generate --fail-on-missing-license -o assets/licenses.md -c script/licenses/zed-licenses.toml script/licenses/template.hbs.md
# cargo about automatically html-escapes all output, so we need to undo it here:
sed -i '' 's/&quot;/"/g' assets/licenses.md
sed -i '' 's/&#x27;/'\''/g' assets/licenses.md # `'\''` ends the string, appends a single quote, and re-opens the string
sed -i '' 's/&#x3D;/=/g' assets/licenses.md
sed -i '' 's/&#x60;/`/g' assets/licenses.md
sed -i '' 's/&lt;/</g' assets/licenses.md
sed -i '' 's/&gt;/>/g' assets/licenses.md

View File

@ -0,0 +1,27 @@
# Third Party Licenses
This page lists the licenses of the projects used in Zed.
## Overview of licenses:
{{#each overview}}
* {{name}} ({{count}})
{{/each}}
## All license texts:
{{#each licenses}}
### {{name}}
#### Used by:
{{#each used_by}}
* [{{crate.name}} {{crate.version}}]({{#if crate.repository}} {{crate.repository}} {{else}} https://crates.io/crates/{{crate.name}} {{/if}})
{{/each}}
{{text}}
--------------------------------------------------------------------------------
{{/each}}

View File

@ -0,0 +1,37 @@
no-clearly-defined = true
private = { ignore = true }
accepted = [
"Apache-2.0",
"MIT",
"Apache-2.0 WITH LLVM-exception",
"MPL-2.0",
"BSD-3-Clause",
"BSD-2-Clause",
"ISC",
"CC0-1.0",
"Unicode-DFS-2016",
"OpenSSL",
"Zlib",
]
workarounds = [
"ring",
"wasmtime",
]
[procinfo.clarify]
license = "MIT"
[[procinfo.clarify.git]]
path = 'LICENSE.md'
checksum = '37db33bbbd7348969eda397b89a16f252d56c1ca7481b6ccaf56ccdcbab5dcca'
[webpki.clarify]
license = "ISC" # It actually says 'ISC-style' but I don't know the SPDX expression for that.
[[webpki.clarify.files]]
path = 'LICENSE'
checksum = '5b698ca13897be3afdb7174256fa1574f8c6892b8bea1a66dd6469d3fe27885a'
[fuchsia-cprng.clarify]
license = "BSD-3-Clause"
[[fuchsia-cprng.clarify.files]]
path = 'LICENSE'
checksum = '03b114f53e6587a398931762ee11e2395bfdba252a329940e2c8c9e81813845b'

View File

@ -11,15 +11,15 @@ const license = {
export const light = createColorScheme(`${name}`, true, {
neutral: chroma.scale([
"#090a0b",
"#202227",
"#383a42",
"#696c77",
"#a0a1a7",
"#e5e5e6",
"#f0f0f1",
"#fafafa",
])
"#090a0b",
"#202227",
"#383a42",
"#696c77",
"#a0a1a7",
"#e5e5e6",
"#f0f0f1",
"#fafafa",
])
.domain([0.05, 0.22, 0.25, 0.45, 0.62, 0.8, 0.9, 1]),
red: colorRamp(chroma("#ca1243")),