This commit is contained in:
LZX committed 2026-09-17 18:41:33 +08:00
1 parent f93f6095af
commit a59ebed397
16 files changed
+988 -85

No files matched your search

+45 -17
View File
@@ -37,6 +37,7 @@ class CodeAutocompleteView extends StatefulWidget implements PreferredSizeWidget
class _CodeAutocompleteViewState extends State<CodeAutocompleteView> {
final ScrollController _scrollController = ScrollController();
final ScrollController _horizontalScrollController = ScrollController();
@override
void initState() {
@@ -57,6 +58,7 @@ class _CodeAutocompleteViewState extends State<CodeAutocompleteView> {
void dispose() {
widget.notifier.removeListener(_handleValueChanged);
_scrollController.dispose();
_horizontalScrollController.dispose();
super.dispose();
}
@@ -74,6 +76,9 @@ class _CodeAutocompleteViewState extends State<CodeAutocompleteView> {
_scrollController.jumpTo(math.max(0.0, targetOffset - viewportDimension + CodeAutocompleteView.itemHeight + CodeAutocompleteView.verticalPadding));
}
}
if (value.index == 0 && _horizontalScrollController.hasClients) {
_horizontalScrollController.jumpTo(0.0);
}
setState(() {});
}
@@ -103,17 +108,39 @@ class _CodeAutocompleteViewState extends State<CodeAutocompleteView> {
],
),
clipBehavior: Clip.antiAlias,
child: ListView.builder(
child: Scrollbar(
controller: _scrollController,
physics: const ClampingScrollPhysics(),
padding: const EdgeInsets.symmetric(vertical: 4.0),
itemCount: prompts.length,
itemExtent: CodeAutocompleteView.itemHeight,
itemBuilder: (context, index) {
final prompt = prompts[index];
final isSelected = index == value.index;
return _buildPromptItem(context, prompt, isSelected, index, theme, isDark);
},
notificationPredicate: (notification) => notification.metrics.axis == Axis.vertical,
child: Scrollbar(
controller: _horizontalScrollController,
notificationPredicate: (notification) => notification.metrics.axis == Axis.horizontal,
child: SingleChildScrollView(
controller: _horizontalScrollController,
scrollDirection: Axis.horizontal,
physics: const ClampingScrollPhysics(),
child: ConstrainedBox(
constraints: BoxConstraints(
minWidth: math.max(0.0, widget.width - 2.0),
),
child: IntrinsicWidth(
child: SingleChildScrollView(
controller: _scrollController,
scrollDirection: Axis.vertical,
physics: const ClampingScrollPhysics(),
padding: const EdgeInsets.symmetric(vertical: 4.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisSize: MainAxisSize.min,
children: [
for (int index = 0; index < prompts.length; index++)
_buildPromptItem(context, prompts[index], index == value.index, index, theme, isDark),
],
),
),
),
),
),
),
),
);
}
@@ -144,13 +171,13 @@ class _CodeAutocompleteViewState extends State<CodeAutocompleteView> {
color: isSelected ? highlightBg : defaultBg,
padding: const EdgeInsets.symmetric(horizontal: 10.0),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
_buildKindIcon(kind, theme),
const SizedBox(width: 8.0),
Expanded(
child: _buildHighlightedText(prompt.word, matchedIndices, theme, isSelected),
),
if (typeText.isNotEmpty)
_buildHighlightedText(prompt.word, matchedIndices, theme, isSelected),
if (typeText.isNotEmpty) ...[
const SizedBox(width: 8.0),
Text(
typeText,
style: TextStyle(
@@ -159,8 +186,9 @@ class _CodeAutocompleteViewState extends State<CodeAutocompleteView> {
fontFamily: 'monospace',
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
softWrap: false,
),
],
],
),
),
@@ -216,7 +244,7 @@ class _CodeAutocompleteViewState extends State<CodeAutocompleteView> {
fontFamily: 'monospace',
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
softWrap: false,
);
}
@@ -246,7 +274,7 @@ class _CodeAutocompleteViewState extends State<CodeAutocompleteView> {
children: spans,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
softWrap: false,
);
}
}
+7 -7
View File
@@ -239,9 +239,9 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
final currentDistance = (p1 - p2).distance;
final rawScale = currentDistance / _initialPinchDistance!;
// 边界弹性阻尼(10.0 ~ 30.0)
final minScale = 10.0 / _initialPinchFontSize!;
final maxScale = 30.0 / _initialPinchFontSize!;
// 边界弹性阻尼(SettingsProvider.minFontSize ~ SettingsProvider.maxFontSize)
final minScale = SettingsProvider.minFontSize / _initialPinchFontSize!;
final maxScale = SettingsProvider.maxFontSize / _initialPinchFontSize!;
final clampedScale = rawScale.clamp(minScale * 0.9, maxScale * 1.1);
final currentGlobalFocal = (p1 + p2) / 2;
@@ -252,7 +252,7 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
_currentLocalFocal = currentLocalFocal;
final continuousFontSize = ((_initialPinchFontSize! * clampedScale) * 10).round() / 10.0;
final newFontSize = continuousFontSize.clamp(10.0, 30.0);
final newFontSize = continuousFontSize.clamp(SettingsProvider.minFontSize, SettingsProvider.maxFontSize);
AppFontItem activeEditorFont = AppFonts.editorJetBrainsMono;
try {
@@ -331,7 +331,7 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
if (finalSize != null && initialFontSize != null && initialLocalFocal != null && currentLocalFocal != null) {
// 手势释放后定格为整数(如 16.0),持久化到用户设置
final double targetFontSize = finalSize.clamp(10.0, 30.0).roundToDouble();
final double targetFontSize = finalSize.clamp(SettingsProvider.minFontSize, SettingsProvider.maxFontSize).roundToDouble();
AppFontItem activeEditorFont = AppFonts.editorJetBrainsMono;
try {
@@ -871,14 +871,14 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
},
textStyle: TextStyle(
color: activeTheme.gutterTextColor,
fontSize: (displayFontSize - 1).clamp(9.0, 30.0),
fontSize: (displayFontSize - 1).clamp(SettingsProvider.minFontSize - 1.0, SettingsProvider.maxFontSize),
fontFamily: activeEditorFont.fontFamily,
fontFamilyFallback: activeEditorFont.fallback,
height: 1.4,
),
focusedTextStyle: TextStyle(
color: activeTheme.focusedGutterTextColor,
fontSize: (displayFontSize - 1).clamp(9.0, 30.0),
fontSize: (displayFontSize - 1).clamp(SettingsProvider.minFontSize - 1.0, SettingsProvider.maxFontSize),
fontWeight: FontWeight.bold,
fontFamily: activeEditorFont.fontFamily,
fontFamilyFallback: activeEditorFont.fallback,
@@ -1,6 +1,7 @@
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:re_editor/re_editor.dart';
import '../../l10n/app_localizations.dart';
import '../../services/lsp/lsp_diagnostics_store.dart';
import '../../services/lsp/lsp_protocol.dart';
import '../lsp_quick_fix_dialog.dart';
@@ -117,6 +118,11 @@ class EditorDiagnosticController {
final isErr = diags.any((d) => d.severity == LspDiagnosticSeverity.error);
final color = isErr ? Colors.redAccent : Colors.amber;
final icon = isErr ? Icons.error_outline : Icons.warning_amber_outlined;
final l10n = AppLocalizations.of(context);
final displayText = l10n != null
? l10n.diagnosticLinePrefix(lineIndex + 1, first.message)
: 'Line ${lineIndex + 1}: ${first.message}';
final fixButtonText = l10n?.quickFixButton ?? 'Fix';
return Material(
color: Theme.of(context).colorScheme.surfaceContainerHighest,
@@ -146,7 +152,7 @@ class EditorDiagnosticController {
const SizedBox(width: 8),
Expanded(
child: Text(
'行 ${lineIndex + 1}: ${first.message}',
displayText,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
@@ -164,12 +170,12 @@ class EditorDiagnosticController {
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: const [
Icon(Icons.lightbulb, size: 12, color: Colors.amber),
SizedBox(width: 2),
children: [
const Icon(Icons.lightbulb, size: 12, color: Colors.amber),
const SizedBox(width: 2),
Text(
'修复',
style: TextStyle(fontSize: 11, fontWeight: FontWeight.w600, color: Colors.amber),
fixButtonText,
style: const TextStyle(fontSize: 11, fontWeight: FontWeight.w600, color: Colors.amber),
),
],
),
+5 -3
View File
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:re_editor/re_editor.dart';
import '../l10n/app_localizations.dart';
import '../services/lsp/lsp_manager.dart';
import '../services/lsp/lsp_protocol.dart';
import '../services/lsp/lsp_workspace_edit_applier.dart';
@@ -38,6 +39,7 @@ class LspQuickFixDialog {
borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
),
builder: (ctx) {
final l10n = AppLocalizations.of(ctx) ?? AppLocalizations.of(context)!;
return SafeArea(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
@@ -61,7 +63,7 @@ class LspQuickFixDialog {
const Icon(Icons.lightbulb, color: Colors.amber, size: 20),
const SizedBox(width: 8),
Text(
'代码问题与修复 (第 ${lineIndex + 1} 行)',
l10n.lspQuickFixTitle(lineIndex + 1),
style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 16),
),
],
@@ -114,7 +116,7 @@ class LspQuickFixDialog {
),
const SizedBox(width: 8),
Text(
'当前报错未提供自动修复动作',
l10n.lspNoFixAvailable,
style: TextStyle(
fontSize: 13,
color: Theme.of(context).colorScheme.onSurfaceVariant,
@@ -129,7 +131,7 @@ class LspQuickFixDialog {
contentPadding: EdgeInsets.zero,
leading: const Icon(Icons.auto_fix_high, color: Colors.blueAccent),
title: Text(act.title, style: const TextStyle(fontSize: 14)),
trailing: act.isPreferred ? const Chip(label: Text('推荐', style: TextStyle(fontSize: 11))) : null,
trailing: act.isPreferred ? Chip(label: Text(l10n.recommended, style: const TextStyle(fontSize: 11))) : null,
onTap: () {
Navigator.pop(ctx);
if (act.edit != null) {