Raise the declared minimums in pubspec.yaml to what our deps already require: Flutter >=3.35.0 / Dart >=3.9.0 (was 3.19.0 / 3.5.0). alchemist 0.12 needs Flutter 3.32; Dart 3.9 first ships in Flutter 3.35, so 3.35 is the binding floor. Pin the exact build toolchain in .fvmrc (Flutter 3.44.1). Moving to the Dart 3.9 language level switches `dart format` to the new "tall" style and enables two new lints. This commit is the resulting mechanical churn, isolated from any behaviour change: - whole-tree `dart format` reformat (tall style) - `dart fix` for unnecessary_underscores + use_null_aware_elements No runtime behaviour change; `make test` green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
125 lines
3.8 KiB
Dart
125 lines
3.8 KiB
Dart
import 'dart:convert';
|
|
|
|
import 'package:clide/kernel/src/syntax/tree_sitter_service.dart';
|
|
import 'package:clide/kernel/src/theme/controller.dart';
|
|
import 'package:clide/widgets/src/typography.dart';
|
|
import 'package:flutter/widgets.dart';
|
|
|
|
class ClideCodeBlock extends StatefulWidget {
|
|
const ClideCodeBlock({super.key, required this.source, this.language});
|
|
|
|
final String source;
|
|
final String? language;
|
|
|
|
@override
|
|
State<ClideCodeBlock> createState() => _ClideCodeBlockState();
|
|
}
|
|
|
|
class _ClideCodeBlockState extends State<ClideCodeBlock> {
|
|
List<SyntaxSpan>? _spans;
|
|
|
|
@override
|
|
void initState() {
|
|
super.initState();
|
|
_highlight();
|
|
}
|
|
|
|
@override
|
|
void didUpdateWidget(ClideCodeBlock old) {
|
|
super.didUpdateWidget(old);
|
|
if (old.source != widget.source || old.language != widget.language) {
|
|
_highlight();
|
|
}
|
|
}
|
|
|
|
Future<void> _highlight() async {
|
|
final lang = widget.language;
|
|
if (lang == null || lang.isEmpty) {
|
|
setState(() => _spans = null);
|
|
return;
|
|
}
|
|
final path = 'code.$lang';
|
|
if (!await TreeSitterService.shared.hasGrammar(path)) {
|
|
setState(() => _spans = null);
|
|
return;
|
|
}
|
|
final result = await TreeSitterService.shared.highlight(path, widget.source);
|
|
if (mounted) setState(() => _spans = result.spans);
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final tokens = ClideTheme.of(context).surface;
|
|
final style = TextStyle(fontFamily: clideMonoFamily, fontFamilyFallback: clideMonoFamilyFallback, fontSize: clideFontMono, color: tokens.globalForeground);
|
|
|
|
final spans = _spans;
|
|
TextSpan textSpan;
|
|
|
|
if (spans == null || spans.isEmpty) {
|
|
textSpan = TextSpan(text: widget.source, style: style);
|
|
} else {
|
|
textSpan = _buildHighlightedSpan(widget.source, spans, style, tokens);
|
|
}
|
|
|
|
return Container(
|
|
width: double.infinity,
|
|
padding: const EdgeInsets.all(10),
|
|
decoration: BoxDecoration(
|
|
color: tokens.panelBackground,
|
|
borderRadius: BorderRadius.circular(4),
|
|
border: Border.all(color: tokens.panelBorder),
|
|
),
|
|
child: SingleChildScrollView(scrollDirection: Axis.horizontal, child: Text.rich(textSpan)),
|
|
);
|
|
}
|
|
|
|
static TextSpan _buildHighlightedSpan(String source, List<SyntaxSpan> spans, TextStyle base, dynamic tokens) {
|
|
final bytes = utf8.encode(source);
|
|
final byteToChar = List<int>.filled(bytes.length + 1, source.length);
|
|
var bi = 0;
|
|
for (var ci = 0; ci < source.length; ci++) {
|
|
byteToChar[bi] = ci;
|
|
final rune = source.codeUnitAt(ci);
|
|
if (rune < 0x80) {
|
|
bi += 1;
|
|
} else if (rune < 0x800) {
|
|
bi += 2;
|
|
} else if (rune >= 0xD800 && rune <= 0xDBFF) {
|
|
bi += 4;
|
|
ci++;
|
|
} else {
|
|
bi += 3;
|
|
}
|
|
}
|
|
byteToChar[bi] = source.length;
|
|
|
|
final sorted = List.of(spans)..sort((a, b) => a.start.compareTo(b.start));
|
|
final children = <TextSpan>[];
|
|
var lastChar = 0;
|
|
|
|
for (final span in sorted) {
|
|
final sChar = span.start < byteToChar.length ? byteToChar[span.start] : source.length;
|
|
final eChar = span.end < byteToChar.length ? byteToChar[span.end] : source.length;
|
|
final clippedStart = sChar < lastChar ? lastChar : sChar;
|
|
if (clippedStart > lastChar) {
|
|
children.add(TextSpan(text: source.substring(lastChar, clippedStart)));
|
|
}
|
|
if (eChar > clippedStart) {
|
|
final color = TreeSitterService.colorForRole(span.role, tokens);
|
|
children.add(
|
|
TextSpan(
|
|
text: source.substring(clippedStart, eChar),
|
|
style: base.copyWith(color: color),
|
|
),
|
|
);
|
|
}
|
|
if (eChar > lastChar) lastChar = eChar;
|
|
}
|
|
if (lastChar < source.length) {
|
|
children.add(TextSpan(text: source.substring(lastChar)));
|
|
}
|
|
|
|
return TextSpan(style: base, children: children);
|
|
}
|
|
}
|