Skip to content
This repository was archived by the owner on Sep 18, 2025. It is now read-only.

Commit dff1bac

Browse files
kujtimiihoxhakujtimiihoxha
committed
wip small fixes
1 parent af2b43a commit dff1bac

6 files changed

Lines changed: 230 additions & 14 deletions

File tree

‎internal/tui/components/chat/sidebar/sidebar.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func (m *sidebarCmp) lspBlock() string {
115115
t := styles.CurrentTheme()
116116

117117
section := t.S().Muted.Render(
118-
core.Section("Configured LSPs", maxWidth),
118+
core.Section("LSPs", maxWidth),
119119
)
120120

121121
lspList := []string{section, ""}
@@ -126,7 +126,7 @@ func (m *sidebarCmp) lspBlock() string {
126126
lipgloss.Left,
127127
section,
128128
"",
129-
t.S().Muted.Render("No LSPs configured."),
129+
t.S().Base.Foreground(t.Border).Render("None"),
130130
)
131131
}
132132

@@ -158,7 +158,7 @@ func (m *sidebarCmp) mcpBlock() string {
158158
t := styles.CurrentTheme()
159159

160160
section := t.S().Muted.Render(
161-
core.Section("Configured MCPs", maxWidth),
161+
core.Section("MCPs", maxWidth),
162162
)
163163

164164
mcpList := []string{section, ""}
@@ -169,7 +169,7 @@ func (m *sidebarCmp) mcpBlock() string {
169169
lipgloss.Left,
170170
section,
171171
"",
172-
t.S().Muted.Render("No MCPs configured."),
172+
t.S().Base.Foreground(t.Border).Render("None"),
173173
)
174174
}
175175

‎internal/tui/components/core/helpers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func Section(title string, width int) string {
1515
length := len(title) + 1
1616
remainingWidth := width - length
1717
if remainingWidth > 0 {
18-
title = title + " " + t.S().Subtle.Render(strings.Repeat(char, remainingWidth))
18+
title = title + " " + t.S().Base.Foreground(t.Border).Render(strings.Repeat(char, remainingWidth))
1919
}
2020
return title
2121
}

‎internal/tui/layout/split.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"github.com/charmbracelet/bubbles/v2/key"
55
tea "github.com/charmbracelet/bubbletea/v2"
66
"github.com/charmbracelet/lipgloss/v2"
7-
"github.com/opencode-ai/opencode/internal/tui/theme"
7+
"github.com/opencode-ai/opencode/internal/tui/styles"
88
"github.com/opencode-ai/opencode/internal/tui/util"
99
)
1010

@@ -126,12 +126,11 @@ func (s *splitPaneLayout) View() tea.View {
126126
cursor = s.leftPanel.View().Cursor()
127127
}
128128

129-
t := theme.CurrentTheme()
129+
t := styles.CurrentTheme()
130130

131-
style := lipgloss.NewStyle().
131+
style := t.S().Base.
132132
Width(s.width).
133-
Height(s.height).
134-
Background(t.Background())
133+
Height(s.height)
135134

136135
view := tea.NewView(style.Render(finalView))
137136
view.SetCursor(cursor)

‎internal/tui/page/chat/chat.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func NewChatPage(app *app.App) util.Model {
166166
layout: layout.NewSplitPane(
167167
layout.WithRightPanel(sidebarContainer),
168168
layout.WithBottomPanel(editorContainer),
169-
layout.WithFixedBottomHeight(3),
169+
layout.WithFixedBottomHeight(5),
170170
layout.WithFixedRightWidth(31),
171171
),
172172
}

‎internal/tui/styles/markdown.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import (
99
"github.com/opencode-ai/opencode/internal/tui/theme"
1010
)
1111

12-
const defaultMargin = 1
13-
1412
// Helper functions for style pointers
1513
func boolPtr(b bool) *bool { return &b }
1614
func stringPtr(s string) *string { return &s }

‎internal/tui/styles/theme.go‎

Lines changed: 220 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,16 @@ import (
66

77
"github.com/charmbracelet/bubbles/v2/textarea"
88
tea "github.com/charmbracelet/bubbletea/v2"
9+
"github.com/charmbracelet/glamour/v2/ansi"
910
"github.com/charmbracelet/lipgloss/v2"
1011
)
1112

13+
const (
14+
defaultListIndent = 2
15+
defaultListLevelIndent = 4
16+
defaultMargin = 2
17+
)
18+
1219
type Theme struct {
1320
Name string
1421
IsDark bool
@@ -56,6 +63,9 @@ type Styles struct {
5663
Error lipgloss.Style
5764
Warning lipgloss.Style
5865
Info lipgloss.Style
66+
// Markdown & Chroma
67+
68+
Markdown ansi.StyleConfig
5969

6070
// Inputs
6171
TextArea textarea.Styles
@@ -70,7 +80,6 @@ func (t *Theme) S() *Styles {
7080

7181
func (t *Theme) buildStyles() *Styles {
7282
base := lipgloss.NewStyle().
73-
Background(t.BgBase).
7483
Foreground(t.FgBase)
7584
return &Styles{
7685
Base: base,
@@ -122,6 +131,216 @@ func (t *Theme) buildStyles() *Styles {
122131
Blink: true,
123132
},
124133
},
134+
135+
// TODO: update using the colors and add colors if missing
136+
Markdown: ansi.StyleConfig{
137+
Document: ansi.StyleBlock{
138+
StylePrimitive: ansi.StylePrimitive{
139+
BlockPrefix: "\n",
140+
BlockSuffix: "\n",
141+
Color: stringPtr("252"),
142+
},
143+
Margin: uintPtr(defaultMargin),
144+
},
145+
BlockQuote: ansi.StyleBlock{
146+
StylePrimitive: ansi.StylePrimitive{},
147+
Indent: uintPtr(1),
148+
IndentToken: stringPtr("│ "),
149+
},
150+
List: ansi.StyleList{
151+
LevelIndent: defaultListIndent,
152+
},
153+
Heading: ansi.StyleBlock{
154+
StylePrimitive: ansi.StylePrimitive{
155+
BlockSuffix: "\n",
156+
Color: stringPtr("39"),
157+
Bold: boolPtr(true),
158+
},
159+
},
160+
H1: ansi.StyleBlock{
161+
StylePrimitive: ansi.StylePrimitive{
162+
Prefix: " ",
163+
Suffix: " ",
164+
Color: stringPtr("228"),
165+
BackgroundColor: stringPtr("63"),
166+
Bold: boolPtr(true),
167+
},
168+
},
169+
H2: ansi.StyleBlock{
170+
StylePrimitive: ansi.StylePrimitive{
171+
Prefix: "## ",
172+
},
173+
},
174+
H3: ansi.StyleBlock{
175+
StylePrimitive: ansi.StylePrimitive{
176+
Prefix: "### ",
177+
},
178+
},
179+
H4: ansi.StyleBlock{
180+
StylePrimitive: ansi.StylePrimitive{
181+
Prefix: "#### ",
182+
},
183+
},
184+
H5: ansi.StyleBlock{
185+
StylePrimitive: ansi.StylePrimitive{
186+
Prefix: "##### ",
187+
},
188+
},
189+
H6: ansi.StyleBlock{
190+
StylePrimitive: ansi.StylePrimitive{
191+
Prefix: "###### ",
192+
Color: stringPtr("35"),
193+
Bold: boolPtr(false),
194+
},
195+
},
196+
Strikethrough: ansi.StylePrimitive{
197+
CrossedOut: boolPtr(true),
198+
},
199+
Emph: ansi.StylePrimitive{
200+
Italic: boolPtr(true),
201+
},
202+
Strong: ansi.StylePrimitive{
203+
Bold: boolPtr(true),
204+
},
205+
HorizontalRule: ansi.StylePrimitive{
206+
Color: stringPtr("240"),
207+
Format: "\n--------\n",
208+
},
209+
Item: ansi.StylePrimitive{
210+
BlockPrefix: "• ",
211+
},
212+
Enumeration: ansi.StylePrimitive{
213+
BlockPrefix: ". ",
214+
},
215+
Task: ansi.StyleTask{
216+
StylePrimitive: ansi.StylePrimitive{},
217+
Ticked: "[✓] ",
218+
Unticked: "[ ] ",
219+
},
220+
Link: ansi.StylePrimitive{
221+
Color: stringPtr("30"),
222+
Underline: boolPtr(true),
223+
},
224+
LinkText: ansi.StylePrimitive{
225+
Color: stringPtr("35"),
226+
Bold: boolPtr(true),
227+
},
228+
Image: ansi.StylePrimitive{
229+
Color: stringPtr("212"),
230+
Underline: boolPtr(true),
231+
},
232+
ImageText: ansi.StylePrimitive{
233+
Color: stringPtr("243"),
234+
Format: "Image: {{.text}} →",
235+
},
236+
Code: ansi.StyleBlock{
237+
StylePrimitive: ansi.StylePrimitive{
238+
Prefix: " ",
239+
Suffix: " ",
240+
Color: stringPtr("203"),
241+
BackgroundColor: stringPtr("236"),
242+
},
243+
},
244+
CodeBlock: ansi.StyleCodeBlock{
245+
StyleBlock: ansi.StyleBlock{
246+
StylePrimitive: ansi.StylePrimitive{
247+
Color: stringPtr("244"),
248+
},
249+
Margin: uintPtr(defaultMargin),
250+
},
251+
Chroma: &ansi.Chroma{
252+
Text: ansi.StylePrimitive{
253+
Color: stringPtr("#C4C4C4"),
254+
},
255+
Error: ansi.StylePrimitive{
256+
Color: stringPtr("#F1F1F1"),
257+
BackgroundColor: stringPtr("#F05B5B"),
258+
},
259+
Comment: ansi.StylePrimitive{
260+
Color: stringPtr("#676767"),
261+
},
262+
CommentPreproc: ansi.StylePrimitive{
263+
Color: stringPtr("#FF875F"),
264+
},
265+
Keyword: ansi.StylePrimitive{
266+
Color: stringPtr("#00AAFF"),
267+
},
268+
KeywordReserved: ansi.StylePrimitive{
269+
Color: stringPtr("#FF5FD2"),
270+
},
271+
KeywordNamespace: ansi.StylePrimitive{
272+
Color: stringPtr("#FF5F87"),
273+
},
274+
KeywordType: ansi.StylePrimitive{
275+
Color: stringPtr("#6E6ED8"),
276+
},
277+
Operator: ansi.StylePrimitive{
278+
Color: stringPtr("#EF8080"),
279+
},
280+
Punctuation: ansi.StylePrimitive{
281+
Color: stringPtr("#E8E8A8"),
282+
},
283+
Name: ansi.StylePrimitive{
284+
Color: stringPtr("#C4C4C4"),
285+
},
286+
NameBuiltin: ansi.StylePrimitive{
287+
Color: stringPtr("#FF8EC7"),
288+
},
289+
NameTag: ansi.StylePrimitive{
290+
Color: stringPtr("#B083EA"),
291+
},
292+
NameAttribute: ansi.StylePrimitive{
293+
Color: stringPtr("#7A7AE6"),
294+
},
295+
NameClass: ansi.StylePrimitive{
296+
Color: stringPtr("#F1F1F1"),
297+
Underline: boolPtr(true),
298+
Bold: boolPtr(true),
299+
},
300+
NameDecorator: ansi.StylePrimitive{
301+
Color: stringPtr("#FFFF87"),
302+
},
303+
NameFunction: ansi.StylePrimitive{
304+
Color: stringPtr("#00D787"),
305+
},
306+
LiteralNumber: ansi.StylePrimitive{
307+
Color: stringPtr("#6EEFC0"),
308+
},
309+
LiteralString: ansi.StylePrimitive{
310+
Color: stringPtr("#C69669"),
311+
},
312+
LiteralStringEscape: ansi.StylePrimitive{
313+
Color: stringPtr("#AFFFD7"),
314+
},
315+
GenericDeleted: ansi.StylePrimitive{
316+
Color: stringPtr("#FD5B5B"),
317+
},
318+
GenericEmph: ansi.StylePrimitive{
319+
Italic: boolPtr(true),
320+
},
321+
GenericInserted: ansi.StylePrimitive{
322+
Color: stringPtr("#00D787"),
323+
},
324+
GenericStrong: ansi.StylePrimitive{
325+
Bold: boolPtr(true),
326+
},
327+
GenericSubheading: ansi.StylePrimitive{
328+
Color: stringPtr("#777777"),
329+
},
330+
Background: ansi.StylePrimitive{
331+
BackgroundColor: stringPtr("#373737"),
332+
},
333+
},
334+
},
335+
Table: ansi.StyleTable{
336+
StyleBlock: ansi.StyleBlock{
337+
StylePrimitive: ansi.StylePrimitive{},
338+
},
339+
},
340+
DefinitionDescription: ansi.StylePrimitive{
341+
BlockPrefix: "\n ",
342+
},
343+
},
125344
}
126345
}
127346

0 commit comments

Comments
 (0)