编辑调整、对比模块
This commit is contained in:
1 parent
c9e61f38c5
commit
6cfa74c901
76 files changed
+9514
-626
No files matched your search
@@ -26,6 +26,7 @@
|
||||
//! 还是 CRLF,否则一次「随手保存」就会在整个 diff 里掀起风暴。
|
||||
|
||||
use std::collections::HashSet;
|
||||
use std::fs::Metadata;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::sync::Mutex;
|
||||
use std::time::UNIX_EPOCH;
|
||||
@@ -293,8 +294,45 @@ fn read_file_inner(
|
||||
if !meta.is_file() {
|
||||
return Err("目标不是普通文件".to_string());
|
||||
}
|
||||
|
||||
let bytes = std::fs::read(p).map_err(|e| format!("读取文件失败: {e}"))?;
|
||||
build_doc(p, &meta, bytes, max_mb, forced_encoding)
|
||||
}
|
||||
|
||||
/// 读取文件,复用调用方**已经读过**的头部(不重开文件、也不重读开头)。
|
||||
///
|
||||
/// 用途是对比模块:它必须「先读头部判断二进制、是文本才整读」(二进制要尽早放弃,
|
||||
/// 不能整读),若先自己嗅探再调 `read_file`,同一个文件会被打开两次、开头读两遍。
|
||||
/// 这里让调用方把**同一个句柄**(读位置已停在 `head` 之后)连同那段头部一起递进来,
|
||||
/// 于是全程只打开一次;也顺带消掉「嗅探时与整读时文件已被换掉」的那个窗口。
|
||||
///
|
||||
/// `meta` 同样由调用方传入(它刚读过一次 `metadata`,两边都省一次 stat)。
|
||||
pub(crate) fn read_file_after_head(
|
||||
mut reader: impl std::io::Read,
|
||||
path: &Path,
|
||||
meta: &Metadata,
|
||||
head: &[u8],
|
||||
max_mb: u32,
|
||||
) -> Result<FileDoc, String> {
|
||||
let mut bytes = Vec::with_capacity(head.len());
|
||||
bytes.extend_from_slice(head);
|
||||
reader
|
||||
.read_to_end(&mut bytes)
|
||||
.map_err(|e| format!("读取文件失败: {e}"))?;
|
||||
build_doc(path, meta, bytes, max_mb, None)
|
||||
}
|
||||
|
||||
/// 读取链路的公共尾部:由「磁盘字节 + 元信息」组装 [`FileDoc`]。
|
||||
///
|
||||
/// 两个调用方共用 —— [`read_file_inner`](自己整读)与 [`read_file_after_head`]
|
||||
/// (头部由调用方提供)。把这段独立出来是为了让「字节从哪来」与「字节怎么解释」解耦,
|
||||
/// 而不是让解码 / 换行 / 元信息这段逻辑出现两份。
|
||||
fn build_doc(
|
||||
p: &Path,
|
||||
meta: &Metadata,
|
||||
bytes: Vec<u8>,
|
||||
max_mb: u32,
|
||||
forced_encoding: Option<&str>,
|
||||
) -> Result<FileDoc, String> {
|
||||
let encoding = match forced_encoding {
|
||||
Some(enc) if !enc.trim().is_empty() => {
|
||||
let requested = enc.trim();
|
||||
|
||||
@@ -33,7 +33,7 @@ mod backup;
|
||||
mod commands;
|
||||
mod dirs;
|
||||
mod export;
|
||||
mod files;
|
||||
pub(crate) mod files;
|
||||
mod grep;
|
||||
mod import;
|
||||
mod index;
|
||||
|
||||
@@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize};
|
||||
use specta::Type;
|
||||
|
||||
/// 结构版本号。字段增减时递增,由 [`EditorSettings::heal`] 推进。
|
||||
pub const EDITOR_SETTINGS_VERSION: u32 = 4;
|
||||
pub const EDITOR_SETTINGS_VERSION: u32 = 5;
|
||||
|
||||
/// 最近文件 / 文件夹各自的保留上限(超出淘汰最旧)。
|
||||
pub const RECENT_LIMIT: usize = 20;
|
||||
@@ -188,7 +188,8 @@ pub struct EditorSettings {
|
||||
pub library_root: Option<String>,
|
||||
/// 编辑器配色方案 key(`"system"` / `"vscode-dark"` / `"vscode-light"` / …)
|
||||
pub editor_theme: String,
|
||||
/// 编辑器配色是否跟随应用深浅(`editor_theme` 仅作取色基准)
|
||||
/// 编辑器**窗口**是否跟随主应用主题(开:整体跟随应用;关:由 `editor_theme` 决定,
|
||||
/// 窗口外壳与编辑区保持同一深浅)
|
||||
pub follow_app_theme: bool,
|
||||
/// 编辑器字体族(空串 = 用内置等宽字体栈)
|
||||
pub font_family: String,
|
||||
@@ -244,7 +245,7 @@ impl Default for EditorSettings {
|
||||
version: EDITOR_SETTINGS_VERSION,
|
||||
library_root: None,
|
||||
editor_theme: "system".to_string(),
|
||||
follow_app_theme: true,
|
||||
follow_app_theme: false,
|
||||
font_family: String::new(),
|
||||
font_size: 14,
|
||||
line_height: 1.7,
|
||||
@@ -328,6 +329,14 @@ impl EditorSettings {
|
||||
changed = true;
|
||||
}
|
||||
|
||||
// v5:`followAppTheme` 的语义从「配色方案取色基准」改为「编辑器窗口是否跟随主应用
|
||||
// 主题」,默认亦由「跟随」改为「不跟随」。仍是 true 说明用户从未改过这个值(旧默认),
|
||||
// 此时改为不跟随;用户显式关过(false)的保持 false,不做任何覆盖。
|
||||
if self.version < 5 && self.follow_app_theme {
|
||||
self.follow_app_theme = false;
|
||||
changed = true;
|
||||
}
|
||||
|
||||
if self.version < EDITOR_SETTINGS_VERSION {
|
||||
self.version = EDITOR_SETTINGS_VERSION;
|
||||
changed = true;
|
||||
|
||||
Reference in new issue
Block a user