jpmschweitzer/clide
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge the pql search panel into the unified Search tab

Browse Source 
The pql sidebar panel and the find-in-files tab were duplicate search
surfaces. Consolidate into one Search tab with a mode switch: Find
(content grep), Vault (pql ranked search), Query (PQL DSL), Markdown
(the synced markdown-file listing, keeping focus-highlight + live
refresh). SearchPanelView holds both FindInFilesController and
PqlController; the pql body + result rows move into a reusable
PqlSearchBody. The standalone builtin.pql sidebar tab is removed (one
fewer tab — eases the rail); the pql extension keeps the Backlinks
context panel. No D-79 conflict — grep vs ranked search remain distinct
backends, this is UI consolidation.

Adds the pql builtin's first widget/controller tests (it was untested,
so folding it into the tested Search panel required covering the
Vault/Query/Markdown modes + PqlController).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
jpmschweitzer
2026-06-01 16:45:54 +02:00
co-authored by Claude Opus 4.8
parent eb90ba14bc
commit a02fc754a8
10 changed files with 430 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/builtin/pql/pql.dart
+1 -1
View File
@@ -2,4 +2,4 @@ export 'src/backlinks_controller.dart';
export 'src/backlinks_view.dart';
export 'src/extension.dart';
export 'src/pql_controller.dart';
export 'src/pql_panel_view.dart';
export 'src/pql_search_body.dart';
lib/builtin/pql/src/extension.dart
+2 -11
View File
@@ -1,5 +1,4 @@
import 'package:clide/builtin/pql/src/backlinks_view.dart';
import 'package:clide/builtin/pql/src/pql_panel_view.dart';
import 'package:clide/extension/extension.dart';
import 'package:clide/kernel/kernel.dart';
import 'package:clide/widgets/widgets.dart';
@@ -14,18 +13,10 @@ class PqlExtension extends ClideExtension {
@override
List<String> get dependsOn => const [];
// The pql search/query/markdown surface moved into the unified Search
// tab (T-201); this extension keeps only the Backlinks context panel.
@override
List<ContributionPoint> get contributions => [
TabContribution(
id: 'pql.panel',
slot: Slots.sidebar,
title: 'pql',
titleKey: 'tab.title',
i18nNamespace: id,
icon: PhosphorIcons.magnifyingGlass,
priority: -60,
build: (_) => const PqlPanelView(),
),
TabContribution(
id: 'pql.backlinks',
slot: Slots.contextPanel,
lib/builtin/pql/src/pql_controller.dart
+5 -2
View File
@@ -50,8 +50,11 @@ class PqlController extends ChangeNotifier {
}
}
void toggleSearchMode() {
_searchMode = _searchMode == SearchMode.search ? SearchMode.dsl : SearchMode.search;
void toggleSearchMode() => setSearchMode(_searchMode == SearchMode.search ? SearchMode.dsl : SearchMode.search);
void setSearchMode(SearchMode mode) {
if (_searchMode == mode) return;
_searchMode = mode;
_results = const [];
_error = null;
notifyListeners();
lib/builtin/pql/src/pql_panel_view.dart → lib/builtin/pql/src/pql_search_body.dart
+70 -117
View File
@@ -1,70 +1,99 @@
/// Sidebar panel for pql — ranked search, DSL query, and markdown file listing.
/// The pql search/query/markdown body, embedded inside the unified
/// Search tab for the Vault / Query / Markdown modes (T-201). Drives a
/// parent-owned [PqlController]; the parent picks the [PqlPaneMode].
///
/// Vault = ranked text search, Query = PQL DSL, Markdown = the synced
/// markdown-file listing (highlights the open doc, live-refreshes on
/// `.md` changes).
library;
import 'dart:async';
import 'package:clide/builtin/pql/src/pql_controller.dart';
import 'package:clide/kernel/kernel.dart';
import 'package:clide/widgets/widgets.dart';
import 'package:flutter/widgets.dart';
import 'pql_controller.dart';
/// Which pql sub-surface the Search tab is showing.
enum PqlPaneMode { vault, query, markdown }
class PqlPanelView extends StatefulWidget {
const PqlPanelView({super.key});
class PqlSearchBody extends StatefulWidget {
const PqlSearchBody({super.key, required this.controller, required this.mode});
final PqlController controller;
final PqlPaneMode mode;
@override
State<PqlPanelView> createState() => _PqlPanelViewState();
State<PqlSearchBody> createState() => _PqlSearchBodyState();
}
class _PqlPanelViewState extends State<PqlPanelView> {
PqlController? _controller;
class _PqlSearchBodyState extends State<PqlSearchBody> {
String? _focusedPath;
final _focusedKey = GlobalKey();
StreamSubscription<Message>? _focusSub;
StreamSubscription<DaemonEvent>? _fileSub;
@override
void initState() {
super.initState();
_applyMode();
}
@override
void didChangeDependencies() {
super.didChangeDependencies();
if (_controller != null) return;
if (_focusSub != null) return;
final kernel = ClideKernel.of(context);
_controller = PqlController(ipc: kernel.ipc);
_focusSub = kernel.messages.subscribe(publisher: 'builtin.markdown', channel: 'focus').listen((msg) {
final path = msg.data['path'] as String?;
if (path == null || path == _focusedPath) return;
setState(() {
_focusedPath = path;
if (_controller!.view != PqlView.markdown) {
_controller!.switchView(PqlView.markdown);
}
});
WidgetsBinding.instance.addPostFrameCallback((_) {
final ctx = _focusedKey.currentContext;
if (ctx != null) Scrollable.ensureVisible(ctx, duration: const Duration(milliseconds: 200), alignment: 0.3);
});
setState(() => _focusedPath = path);
if (widget.controller.view == PqlView.markdown) {
WidgetsBinding.instance.addPostFrameCallback((_) {
final ctx = _focusedKey.currentContext;
if (ctx != null) Scrollable.ensureVisible(ctx, duration: const Duration(milliseconds: 200), alignment: 0.3);
});
}
});
_fileSub = kernel.events
.on<DaemonEvent>()
.where((e) => e.subsystem == 'files' && e.kind == 'files.changed' && (e.data['path'] as String? ?? '').endsWith('.md'))
.listen((_) {
if (_controller?.view == PqlView.markdown) {
unawaited(_controller!.loadMarkdownFiles());
}
if (widget.controller.view == PqlView.markdown) unawaited(widget.controller.loadMarkdownFiles());
});
}
@override
void didUpdateWidget(PqlSearchBody old) {
super.didUpdateWidget(old);
if (old.mode != widget.mode) _applyMode();
}
/// Map the flat pane mode onto the controller's (view, searchMode).
void _applyMode() {
final c = widget.controller;
switch (widget.mode) {
case PqlPaneMode.vault:
c.setSearchMode(SearchMode.search);
c.switchView(PqlView.query);
case PqlPaneMode.query:
c.setSearchMode(SearchMode.dsl);
c.switchView(PqlView.query);
case PqlPaneMode.markdown:
c.switchView(PqlView.markdown);
}
}
@override
void dispose() {
_focusSub?.cancel();
_fileSub?.cancel();
_controller?.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
final c = _controller;
if (c == null) return const SizedBox.shrink();
final c = widget.controller;
return ListenableBuilder(
listenable: c,
builder: (context, _) {
@@ -72,22 +101,20 @@ class _PqlPanelViewState extends State<PqlPanelView> {
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_ViewTabs(controller: c),
if (c.view == PqlView.query) ...[
_SearchInput(controller: c),
],
if (c.view == PqlView.markdown)
if (widget.mode == PqlPaneMode.markdown)
ClideFilterBox(
hint: 'Filter markdown…',
onChanged: (v) => unawaited(c.loadMarkdownFiles(glob: v.isEmpty ? null : '**/*$v*.md')),
),
)
else
_PqlSearchInput(controller: c, dsl: widget.mode == PqlPaneMode.query),
if (c.error != null)
Padding(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
child: ClideText(c.error!, color: tokens.statusError, fontSize: clideFontCaption, maxLines: 3),
),
if (c.loading && c.results.isEmpty) const Padding(padding: EdgeInsets.all(12), child: ClideText('Loading…', muted: true)),
if (!c.loading && c.results.isEmpty && c.error == null && c.view == PqlView.markdown)
if (!c.loading && c.results.isEmpty && c.error == null && widget.mode == PqlPaneMode.markdown)
const Padding(padding: EdgeInsets.all(12), child: ClideText('No markdown files found.', muted: true)),
Expanded(
child: SingleChildScrollView(
@@ -96,16 +123,16 @@ class _PqlPanelViewState extends State<PqlPanelView> {
crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisSize: MainAxisSize.min,
children: [
if (c.view == PqlView.markdown)
if (widget.mode == PqlPaneMode.markdown)
for (final f in c.results)
_FileRow(
entry: f,
focused: (f['path'] as String?) == _focusedPath,
focusKey: (f['path'] as String?) == _focusedPath ? _focusedKey : null,
),
if (c.view == PqlView.query && c.searchMode == SearchMode.search)
if (widget.mode == PqlPaneMode.vault)
for (final r in c.results) _SearchResultRow(entry: r),
if (c.view == PqlView.query && c.searchMode == SearchMode.dsl)
if (widget.mode == PqlPaneMode.query)
for (final r in c.results) _QueryResultRow(entry: r),
],
),
@@ -118,92 +145,18 @@ class _PqlPanelViewState extends State<PqlPanelView> {
}
}
class _ViewTabs extends StatelessWidget {
const _ViewTabs({required this.controller});
class _PqlSearchInput extends StatelessWidget {
const _PqlSearchInput({required this.controller, required this.dsl});
final PqlController controller;
final bool dsl;
@override
Widget build(BuildContext context) {
final tokens = ClideTheme.of(context).surface;
return Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: BoxDecoration(
border: Border(bottom: BorderSide(color: tokens.panelBorder)),
),
child: Row(
children: [
for (final v in PqlView.values)
Padding(
padding: const EdgeInsets.only(right: 8),
child: GestureDetector(
onTap: () => controller.switchView(v),
child: MouseRegion(
cursor: SystemMouseCursors.click,
child: ClideText(
_tabLabel(v),
fontSize: clideFontCaption,
color: controller.view == v ? tokens.globalForeground : tokens.globalTextMuted,
),
),
),
),
],
),
);
}
static String _tabLabel(PqlView v) => switch (v) {
PqlView.query => 'Search',
PqlView.markdown => 'Markdown',
};
}
class _SearchInput extends StatelessWidget {
const _SearchInput({required this.controller});
final PqlController controller;
@override
Widget build(BuildContext context) {
final tokens = ClideTheme.of(context).surface;
final isDsl = controller.searchMode == SearchMode.dsl;
return Column(
mainAxisSize: MainAxisSize.min,
children: [
ClideFilterBox(
hint: isDsl ? 'PQL query…' : 'Search vault…',
debounce: isDsl ? Duration.zero : const Duration(milliseconds: 300),
onChanged: isDsl ? (_) {} : (v) => unawaited(controller.search(v)),
onSubmitted: isDsl ? (v) => unawaited(controller.runQuery(v)) : (v) => unawaited(controller.search(v)),
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
child: Row(
children: [
GestureDetector(
onTap: controller.toggleSearchMode,
child: MouseRegion(
cursor: SystemMouseCursors.click,
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
decoration: BoxDecoration(
color: isDsl ? tokens.globalFocus.withAlpha(0x30) : null,
borderRadius: BorderRadius.circular(3),
border: Border.all(color: isDsl ? tokens.globalFocus : tokens.panelBorder),
),
child: ClideText('DSL', fontSize: clideFontBadge, color: isDsl ? tokens.globalFocus : tokens.globalTextMuted, fontFamily: clideMonoFamily),
),
),
),
const SizedBox(width: 6),
ClideText(
isDsl ? 'SQL-like query mode' : 'ranked text search',
fontSize: clideFontBadge,
muted: true,
),
],
),
),
],
return ClideFilterBox(
hint: dsl ? 'PQL query…' : 'Search vault…',
debounce: dsl ? Duration.zero : const Duration(milliseconds: 300),
onChanged: dsl ? (_) {} : (v) => unawaited(controller.search(v)),
onSubmitted: dsl ? (v) => unawaited(controller.runQuery(v)) : (v) => unawaited(controller.search(v)),
);
}
}
lib/builtin/search/src/search_panel_view.dart
+81 -3
View File
@@ -1,8 +1,12 @@
/// The find-in-files sidebar panel (T-52, per D-79). A search input
/// with regex/case toggles + include/exclude glob fields, and a results
/// list grouped by file. Clicking a match opens the editor at its line.
/// The unified Search sidebar tab (T-52 / T-201). A mode switch selects
/// among: Find (content grep, per D-79), Vault (pql ranked search),
/// Query (PQL DSL), and Markdown (the synced markdown-file listing).
/// The find modes own a [FindInFilesController]; the pql modes a
/// [PqlController] rendered by [PqlSearchBody].
library;
import 'package:clide/builtin/pql/src/pql_controller.dart';
import 'package:clide/builtin/pql/src/pql_search_body.dart';
import 'package:clide/builtin/search/src/find_in_files_controller.dart';
import 'package:clide/kernel/kernel.dart';
import 'package:clide/src/search/match.dart';
@@ -10,6 +14,9 @@ import 'package:clide/src/search/replace_engine.dart';
import 'package:clide/widgets/widgets.dart';
import 'package:flutter/widgets.dart';
/// The Search tab's top-level mode.
enum SearchTabMode { find, vault, query, markdown }
class SearchPanelView extends StatefulWidget {
const SearchPanelView({super.key});
@@ -19,6 +26,8 @@ class SearchPanelView extends StatefulWidget {
class _SearchPanelViewState extends State<SearchPanelView> {
FindInFilesController? _controller;
PqlController? _pql;
SearchTabMode _mode = SearchTabMode.find;
@override
void didChangeDependencies() {
@@ -26,11 +35,13 @@ class _SearchPanelViewState extends State<SearchPanelView> {
if (_controller != null) return;
final kernel = ClideKernel.of(context);
_controller = FindInFilesController(ipc: kernel.ipc, events: kernel.events);
_pql = PqlController(ipc: kernel.ipc);
}
@override
void dispose() {
_controller?.dispose();
_pql?.dispose();
super.dispose();
}
@@ -56,6 +67,30 @@ class _SearchPanelViewState extends State<SearchPanelView> {
@override
Widget build(BuildContext context) {
final tokens = ClideTheme.of(context).surface;
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_ModeSwitcher(mode: _mode, tokens: tokens, onSelect: (m) => setState(() => _mode = m)),
Expanded(child: _body()),
],
);
}
Widget _body() {
switch (_mode) {
case SearchTabMode.find:
return _findBody();
case SearchTabMode.vault:
return PqlSearchBody(controller: _pql!, mode: PqlPaneMode.vault);
case SearchTabMode.query:
return PqlSearchBody(controller: _pql!, mode: PqlPaneMode.query);
case SearchTabMode.markdown:
return PqlSearchBody(controller: _pql!, mode: PqlPaneMode.markdown);
}
}
Widget _findBody() {
final tokens = ClideTheme.of(context).surface;
final c = _controller!;
return ListenableBuilder(
@@ -146,6 +181,49 @@ class _SearchPanelViewState extends State<SearchPanelView> {
}
}
class _ModeSwitcher extends StatelessWidget {
const _ModeSwitcher({required this.mode, required this.tokens, required this.onSelect});
final SearchTabMode mode;
final SurfaceTokens tokens;
final ValueChanged<SearchTabMode> onSelect;
static const _labels = {
SearchTabMode.find: 'Find',
SearchTabMode.vault: 'Vault',
SearchTabMode.query: 'Query',
SearchTabMode.markdown: 'Markdown',
};
@override
Widget build(BuildContext context) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 5),
decoration: BoxDecoration(border: Border(bottom: BorderSide(color: tokens.panelBorder))),
child: Row(
children: [
for (final m in SearchTabMode.values) ...[
Semantics(
button: true,
selected: m == mode,
label: _labels[m]!,
child: ClideTappable(
onTap: () => onSelect(m),
builder: (ctx, hovered, _) => ClideText(
_labels[m]!,
fontSize: clideFontCaption,
color: m == mode ? tokens.globalForeground : (hovered ? tokens.sidebarForeground : tokens.globalTextMuted),
),
),
),
const SizedBox(width: 10),
],
],
),
);
}
}
class _Toggle extends StatelessWidget {
const _Toggle({
required this.label,