Skip to content

feat(frontend): syntax-highlight all tool results + expand language support #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dimakis wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(frontend): syntax-highlight all tool results + expand language support #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions frontend/src/components/CodeBlock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,19 @@ import { CopyButton } from './CopyButton';
// IMPORTANT: Keep in sync with EXT_MAP in packages/protocol/src/language.ts
import bash from 'highlight.js/lib/languages/bash';
import c from 'highlight.js/lib/languages/c';
import clojure from 'highlight.js/lib/languages/clojure';
import cmake from 'highlight.js/lib/languages/cmake';
import cpp from 'highlight.js/lib/languages/cpp';
import csharp from 'highlight.js/lib/languages/csharp';
import css from 'highlight.js/lib/languages/css';
import dart from 'highlight.js/lib/languages/dart';
import diff from 'highlight.js/lib/languages/diff';
import dockerfile from 'highlight.js/lib/languages/dockerfile';
import elixir from 'highlight.js/lib/languages/elixir';
import erlang from 'highlight.js/lib/languages/erlang';
import go from 'highlight.js/lib/languages/go';
import graphql from 'highlight.js/lib/languages/graphql';
import haskell from 'highlight.js/lib/languages/haskell';
import ini from 'highlight.js/lib/languages/ini';
import java from 'highlight.js/lib/languages/java';
import javascript from 'highlight.js/lib/languages/javascript';
Expand All @@ -25,30 +30,42 @@ import less from 'highlight.js/lib/languages/less';
import lua from 'highlight.js/lib/languages/lua';
import makefile from 'highlight.js/lib/languages/makefile';
import markdown from 'highlight.js/lib/languages/markdown';
import nginx from 'highlight.js/lib/languages/nginx';
import nix from 'highlight.js/lib/languages/nix';
import objectivec from 'highlight.js/lib/languages/objectivec';
import ocaml from 'highlight.js/lib/languages/ocaml';
import perl from 'highlight.js/lib/languages/perl';
import php from 'highlight.js/lib/languages/php';
import powershell from 'highlight.js/lib/languages/powershell';
import protobuf from 'highlight.js/lib/languages/protobuf';
import python from 'highlight.js/lib/languages/python';
import r from 'highlight.js/lib/languages/r';
import ruby from 'highlight.js/lib/languages/ruby';
import rust from 'highlight.js/lib/languages/rust';
import scala from 'highlight.js/lib/languages/scala';
import scss from 'highlight.js/lib/languages/scss';
import sql from 'highlight.js/lib/languages/sql';
import swift from 'highlight.js/lib/languages/swift';
import typescript from 'highlight.js/lib/languages/typescript';
import wasm from 'highlight.js/lib/languages/wasm';
import xml from 'highlight.js/lib/languages/xml';
import yaml from 'highlight.js/lib/languages/yaml';

hljs.registerLanguage('bash', bash);
hljs.registerLanguage('c', c);
hljs.registerLanguage('clojure', clojure);
hljs.registerLanguage('cmake', cmake);
hljs.registerLanguage('cpp', cpp);
hljs.registerLanguage('csharp', csharp);
hljs.registerLanguage('css', css);
hljs.registerLanguage('dart', dart);
hljs.registerLanguage('diff', diff);
hljs.registerLanguage('dockerfile', dockerfile);
hljs.registerLanguage('elixir', elixir);
hljs.registerLanguage('erlang', erlang);
hljs.registerLanguage('go', go);
hljs.registerLanguage('graphql', graphql);
hljs.registerLanguage('haskell', haskell);
hljs.registerLanguage('ini', ini);
hljs.registerLanguage('java', java);
hljs.registerLanguage('javascript', javascript);
Expand All @@ -59,17 +76,24 @@ hljs.registerLanguage('less', less);
hljs.registerLanguage('lua', lua);
hljs.registerLanguage('makefile', makefile);
hljs.registerLanguage('markdown', markdown);
hljs.registerLanguage('nginx', nginx);
hljs.registerLanguage('nix', nix);
hljs.registerLanguage('objectivec', objectivec);
hljs.registerLanguage('ocaml', ocaml);
hljs.registerLanguage('perl', perl);
hljs.registerLanguage('php', php);
hljs.registerLanguage('powershell', powershell);
hljs.registerLanguage('protobuf', protobuf);
hljs.registerLanguage('python', python);
hljs.registerLanguage('r', r);
hljs.registerLanguage('ruby', ruby);
hljs.registerLanguage('rust', rust);
hljs.registerLanguage('scala', scala);
hljs.registerLanguage('scss', scss);
hljs.registerLanguage('sql', sql);
hljs.registerLanguage('swift', swift);
hljs.registerLanguage('typescript', typescript);
hljs.registerLanguage('wasm', wasm);
hljs.registerLanguage('xml', xml);
hljs.registerLanguage('yaml', yaml);

Expand Down
26 changes: 9 additions & 17 deletions frontend/src/components/ToolPill.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function RawInputDetail({
return null;
}

/** Render tool result — syntax-highlighted for read/write tools, plain for others. */
/** Render tool result with syntax highlighting when language is known. */
function ToolResult({
block,
onPopOut,
Expand All @@ -87,25 +87,17 @@ function ToolResult({
if (block.toolResult === undefined) return null;

const raw = block.rawInput;
// For Read tool results, show the file content with syntax highlighting
if (raw?.type === 'read' && block.toolResult) {
return (
<div className="tool-pill-section">
<CodeBlock
code={block.toolResult}
language={raw.language}
label={raw.path}
maxHeight={400}
onPopOut={raw.path && onPopOut ? () => onPopOut(raw.path!) : undefined}
/>
</div>
);
}
const isRead = raw?.type === 'read';

return (
<div className="tool-pill-section">
<span className="tool-pill-label">Result</span>
<pre className="tool-pill-pre">{block.toolResult}</pre>
<CodeBlock
code={block.toolResult}
language={raw?.language}
label={isRead ? raw?.path : 'Result'}
maxHeight={400}
onPopOut={isRead && raw?.path && onPopOut ? () => onPopOut(raw.path!) : undefined}
/>
</div>
);
}
Expand Down
26 changes: 26 additions & 0 deletions packages/protocol/src/language.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,25 @@ const EXT_MAP: Record<string, string> = {
kts: 'kotlin',
swift: 'swift',
cs: 'csharp',
m: 'objectivec',
mm: 'objectivec',
dart: 'dart',
scala: 'scala',
sbt: 'scala',

// Functional
hs: 'haskell',
lhs: 'haskell',
ml: 'ocaml',
mli: 'ocaml',
clj: 'clojure',
cljs: 'clojure',
cljc: 'clojure',
edn: 'clojure',
ex: 'elixir',
exs: 'elixir',
erl: 'erlang',
hrl: 'erlang',

// Scripting
rb: 'ruby',
Expand All @@ -64,13 +83,20 @@ const EXT_MAP: Record<string, string> = {
php: 'php',
r: 'r',
R: 'r',
ps1: 'powershell',
psm1: 'powershell',
psd1: 'powershell',

// Markup / Docs
md: 'markdown',
mdx: 'markdown',
tex: 'latex',

// Infrastructure
dockerfile: 'dockerfile',
nix: 'nix',
wat: 'wasm',
wast: 'wasm',

// SQL
sql: 'sql',
Expand Down
Loading