This commit is contained in:
LZX committed 2026-09-23 18:36:36 +08:00
1 parent f99d09c7f6
commit deb510d4f5
12 files changed
+507 -32

No files matched your search

+12
View File
@@ -486,6 +486,18 @@ class LspLanguageConfig {
'apt-get update && apt-get install -y --no-install-recommends npm && npm install -g @bufbuild/buf && ln -sf \$(which buf) /usr/local/bin/bufls',
enabled: true,
),
const LspLanguageConfig(
id: 'mcfunction',
name: 'Minecraft Function',
languageId: 'mcfunction',
fileExtensions: ['.mcfunction'],
serverCommand: 'spyglassmc',
serverArgs: ['--stdio'],
package: '@spyglassmc/language-server',
installCommand:
'apt-get update && apt-get install -y --no-install-recommends nodejs npm && npm install -g @spyglassmc/language-server',
enabled: true,
),
];
/// 保持向后兼容别名
+21 -12
View File
@@ -11,7 +11,18 @@ import '../utils/git_error_mapper.dart';
class GitProvider extends ChangeNotifier {
final GitService _gitService;
GitProvider({GitService? gitService}) : _gitService = gitService ?? GitService.instance;
GitProvider({GitService? gitService}) : _gitService = gitService ?? GitService.instance {
_initGitEnvironment();
}
void _initGitEnvironment() async {
try {
final env = await _gitService.checkGitInstalled();
_gitInstalled = env.isInstalled;
_gitVersion = env.version;
notifyListeners();
} catch (_) {}
}
String? _rootPath;
List<GitRepositoryInfo> _repositories = [];
@@ -343,11 +354,7 @@ class GitProvider extends ChangeNotifier {
_errorMessage = null;
_clearRemoteState();
if (_rootPath != null) {
refresh();
} else {
notifyListeners();
}
refresh();
}
}
@@ -420,6 +427,13 @@ class GitProvider extends ChangeNotifier {
Future<void> refresh() async {
final seq = ++_refreshSeq;
// 1. 无论是否打开工程目录,都先校验环境中的 Git 是否已就绪
final env = await _gitService.checkGitInstalled();
if (seq != _refreshSeq) return;
_gitInstalled = env.isInstalled;
_gitVersion = env.version;
if (_rootPath == null || _rootPath!.isEmpty) {
_repositories = [];
_currentRepoPath = null;
@@ -431,6 +445,7 @@ class GitProvider extends ChangeNotifier {
_commits = [];
_stashCount = 0;
_isLoading = false;
_errorMessage = !env.isInstalled ? (env.errorMessage ?? '未检测到 Git 命令行工具') : null;
_clearRemoteState();
notifyListeners();
return;
@@ -441,12 +456,6 @@ class GitProvider extends ChangeNotifier {
notifyListeners();
try {
// 1. 校验 Git 命令行工具环境
final env = await _gitService.checkGitInstalled();
if (seq != _refreshSeq) return;
_gitInstalled = env.isInstalled;
_gitVersion = env.version;
if (!env.isInstalled) {
_errorMessage = env.errorMessage ?? '未检测到 Git 命令行工具';
_isLoading = false;
@@ -138,7 +138,9 @@ class SmartCodeAutocompletePromptsBuilder implements CodeAutocompletePromptsBuil
return (code >= 65 && code <= 90) || // A-Z
(code >= 97 && code <= 122) || // a-z
(code >= 48 && code <= 57) || // 0-9
code == 95; // _
code == 95 || // _
code == 64 || // @ (for entity selectors e.g. @a, @e, @s, @p)
code == 36; // $ (for macro variables and identifiers)
}
}
@@ -23,11 +23,55 @@ class DartProjectModule extends ProjectModule {
bool shouldActivate(Directory projectDir) =>
File(p.join(projectDir.path, 'pubspec.yaml')).existsSync();
/// Dart SDK 目前没有可用的发行版一键安装命令,因此不做自动补全,
/// 仅在探测阶段如实报告"未找到 dart"。
/// 检查是否为 Flutter 项目(依赖包含 flutter sdk 或 flutter 配置节点)
static bool isFlutterProject(Directory projectDir) {
final pubspec = File(p.join(projectDir.path, 'pubspec.yaml'));
if (!pubspec.existsSync()) return false;
try {
final content = pubspec.readAsStringSync();
return content.contains('sdk: flutter') ||
content.contains('\nflutter:') ||
content.contains('flutter:\r\n');
} catch (_) {
return false;
}
}
/// Dart SDK 目前没有可用的发行版一键安装命令,因此不做自动补全。
/// 对于 Flutter 项目,若容器内未安装 Flutter 工具链则优雅跳过,避免误报"未找到 dart 探测失败"。
@override
Future<ModuleProbeResult> probe(ProjectProbe probe) async {
if (probe.isCancelled) return ModuleProbeResult.cancelled(id);
final isFlutter = isFlutterProject(probe.projectDir);
if (isFlutter) {
final hasFlutter = await probe.hasCommand('flutter');
if (hasFlutter) {
return ModuleProbeResult.ok(id, [
RunTask(
id: 'detected_flutter_run',
name: 'Flutter: Run',
command: 'flutter run',
source: TaskSource.detected,
group: 'application',
moduleId: id,
icon: Icons.play_circle_outline,
),
RunTask(
id: 'detected_flutter_test',
name: 'Flutter: Test',
command: 'flutter test',
source: TaskSource.detected,
group: 'verification',
moduleId: id,
icon: Icons.fact_check_outlined,
),
]);
}
// 移动端轻量 Linux 容器未配置 Flutter SDK 时,作为纯代码项目正常打开,不弹出报错打扰用户
return ModuleProbeResult.ok(id, const []);
}
final available = await probe.hasCommand('dart');
if (!available) {
return const ModuleProbeResult.failed(
+4
View File
@@ -20,9 +20,13 @@ class FileIconUtils {
lowerName == '.gitmodules') {
return Icons.commit_outlined;
}
if (lowerName == 'pack.mcmeta') {
return Icons.inventory_2_outlined;
}
final ext = p.extension(name).toLowerCase();
return switch (ext) {
'.mcfunction' => Icons.integration_instructions_outlined,
'.dart' => Icons.flutter_dash,
'.html' || '.htm' => Icons.html,
'.css' || '.scss' || '.sass' || '.less' => Icons.css,
+9 -2
View File
@@ -3,6 +3,7 @@ import 'package:path/path.dart' as p;
import 'package:re_editor/re_editor.dart';
import 'package:re_highlight/languages/all.dart';
import 'package:re_highlight/re_highlight.dart';
import 'syntax_languages/mcfunction.dart';
/// 语法高亮辅助类:
/// 1. 基于文件后缀与特殊文件名的 O(1) 语法匹配,彻底避免全量遍历
@@ -125,6 +126,9 @@ class SyntaxHighlightHelper {
'.dockerfile': 'dockerfile',
'.graphql': 'graphql',
'.gql': 'graphql',
// Minecraft
'.mcfunction': 'mcfunction',
};
/// 根据文件路径获取对应的 re_highlight 语言 ID,未匹配则返回 null
@@ -155,7 +159,7 @@ class SyntaxHighlightHelper {
if (cached != null) {
return cached;
}
final definition = builtinAllLanguages[langId];
final definition = langId == 'mcfunction' ? langMcfunction : builtinAllLanguages[langId];
if (definition != null) {
// 对标 VS Code 性能保护策略:
// 1. 文件文本超过 2MB 时,安全降级为纯文本,防止巨型语法树引发主线程垃圾回收暂停;
@@ -189,10 +193,13 @@ class SyntaxHighlightHelper {
static Mode? getGrammarModeForFile(String? filePath) {
final langId = getLanguageId(filePath);
if (langId == null) return null;
if (langId == 'mcfunction') return langMcfunction;
return builtinAllLanguages[langId];
}
static final Highlight _highlightInstance = Highlight()..registerLanguages(builtinAllLanguages);
static final Highlight _highlightInstance = Highlight()
..registerLanguages(builtinAllLanguages)
..registerLanguage('mcfunction', langMcfunction);
/// 针对单行代码生成带语法高亮的 TextSpan(供 Diff 视图等只读代码渲染)
static TextSpan highlightLine({
@@ -0,0 +1,98 @@
import 'package:re_highlight/re_highlight.dart';
/// Minecraft Function (.mcfunction) 语法高亮定义
/// 基于 Modrinth 官方/社区主流 better-highlightjs-mcfunction 规范转译,
/// 完美适配 re_highlight 引擎与 Android 移动端高性能只读/编辑渲染。
final Mode langMcfunction = Mode(
refs: {},
name: 'Minecraft Function',
aliases: ['mcfunction', 'mcf'],
caseInsensitive: true,
contains: <Mode>[
// 1. 注释行与行内注释 (# ...)
HASH_COMMENT_MODE,
// 2. 字符串字面量(支持单引号与双引号转义)
Mode(
scope: 'string',
variants: <Mode>[
Mode(
begin: '"',
end: '"',
contains: <Mode>[
Mode(begin: '""'),
BACKSLASH_ESCAPE,
],
),
Mode(
begin: "'",
end: "'",
contains: <Mode>[
Mode(begin: "''"),
BACKSLASH_ESCAPE,
],
),
],
),
// 3. 宏变量 $(variable) - Minecraft 1.20.2+ 原生命令宏
Mode(
scope: 'variable',
begin: r'\$\([a-zA-Z_][a-zA-Z0-9_]*\)',
),
// 4. 目标实体选择器 (@p, @a, @e, @s, @r) 及条件方括号 [@e[type=zombie,distance=..10]]
Mode(
scope: 'variable',
begin: r'@[apers](?:\[[^\]\r\n]*\])?',
),
// 5. 标准实体与数据 UUID
Mode(
scope: 'number',
begin: r'\b[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\b',
),
// 6. 命名空间与资源标识符 (minecraft:stone, #minecraft:arrows, custom:item/weapon)
Mode(
scope: 'symbol',
begin: r'#?[a-z0-9_.-]+:[a-z0-9_./-]+',
),
// 7. 相对坐标与视线坐标 (~, ^, ~10, ^-0.5)
Mode(
scope: 'symbol',
begin: r'(?:~|\^)(?:-?\d*(?:\.\d+)?)?',
),
// 8. Minecraft 数字字面量与类型后缀 (10b, 1.5f, 1000L, 0.5d, 2s)
Mode(
scope: 'number',
begin: r'-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[bB|dD|fF|lL|sS])?(?![a-zA-Z0-9_.])',
),
// 9. 顶级核心命令关键字
Mode(
scope: 'keyword',
begin: r'(?:^|\s)(?:advancement|attribute|ban|ban-ip|banlist|bossbar|clear|clone|damage|data|datapack|debug|defaultgamemode|deop|difficulty|effect|enchant|execute|experience|fill|fillbiome|forceload|function|gamemode|gamerule|give|help|item|jfr|kick|kill|list|locate|loot|me|msg|op|pardon|pardon-ip|particle|perf|place|playsound|publish|recipe|reload|return|ride|save-all|save-off|save-on|say|schedule|scoreboard|seed|setblock|setidletimeout|setworldspawn|spawnpoint|spectate|spreadplayers|stop|stopsound|summon|tag|team|teammsg|teleport|tell|tellraw|test|tick|time|title|tm|tp|transfer|trigger|w|weather|whitelist|worldborder|xp)(?=\s|$)',
),
// 10. execute / data / scoreboard 等高频子命令关键字
Mode(
scope: 'built_in',
begin: r'\b(?:run|as|at|positioned|align|facing|rotated|in|anchored|if|unless|store|block|blocks|entity|score|matches|storage|result|success|eyes|feet|add|remove|set|get|merge|modify|query|reset|enable|operation)\b',
),
// 11. 布尔字面量
Mode(
scope: 'literal',
begin: r'\b(?:true|false)\b',
),
// 12. 记分板与计算运算符
Mode(
scope: 'operator',
begin: r'(=|\+=|-=|\*=|/=|%=|<|>|><|<=|>=)',
),
],
);
+15 -10
View File
@@ -53,10 +53,15 @@ class _GitPanelWidgetState extends State<GitPanelWidget> {
_scrollController.addListener(_onScrollChanged);
WidgetsBinding.instance.addPostFrameCallback((_) {
if (mounted && _scrollController.hasClients && gitProvider.scrollOffset > 0) {
final maxScroll = _scrollController.position.maxScrollExtent;
final target = gitProvider.scrollOffset.clamp(0.0, maxScroll);
_scrollController.jumpTo(target);
if (mounted) {
if (!gitProvider.hasProject) {
gitProvider.refresh();
}
if (_scrollController.hasClients && gitProvider.scrollOffset > 0) {
final maxScroll = _scrollController.position.maxScrollExtent;
final target = gitProvider.scrollOffset.clamp(0.0, maxScroll);
_scrollController.jumpTo(target);
}
}
});
}
@@ -1108,7 +1113,12 @@ class _GitPanelWidgetState extends State<GitPanelWidget> {
AppLocalizations l10n,
GitProvider gitProvider,
) {
// 1. 未打开工程目录
// 1. 宿主/容器未安装 Git 命令行工具(优先级最高:未安装 Git > 未打开工程)
if (!gitProvider.gitInstalled) {
return _buildGitNotInstalledView(context, theme, l10n, gitProvider);
}
// 2. 未打开工程目录
if (!gitProvider.hasProject) {
return _buildEmptyState(
theme: theme,
@@ -1118,11 +1128,6 @@ class _GitPanelWidgetState extends State<GitPanelWidget> {
);
}
// 2. 宿主/容器未安装 Git 命令行工具
if (!gitProvider.gitInstalled) {
return _buildGitNotInstalledView(context, theme, l10n, gitProvider);
}
// 3. 正在加载中且尚未加载出任何仓库
if (gitProvider.isLoading && !gitProvider.hasRepository) {
return const Center(child: CircularProgressIndicator());