feat: syntax highlighting working as expected

wllfaria · May 1, 2024 · db39c05 · db39c05
1 parent 5c37430
commit db39c05
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 deletions.
diff --git a/colors/src/colors.rs b/colors/src/colors.rs
@@ -23,14 +23,21 @@ impl Default for Colors {
 
 fn token_highlight() -> HashMap<String, Style> {
     let mut tokens = HashMap::new();
-    let colors = NormalColors::default();
+    let colors = BrightColors::default();
 
     tokens.insert("conceal".into(), Style::new().fg(colors.red));
-    tokens.insert("number".into(), Style::new().fg(colors.blue));
-    tokens.insert("property".into(), Style::new().fg(colors.green));
-    tokens.insert("punctuation.bracket".into(), Style::new().fg(colors.yellow));
-    tokens.insert("punctuation.delimiter".into(), Style::new().fg(colors.cyan));
-    tokens.insert("string".into(), Style::new().fg(colors.magenta));
+    tokens.insert("boolean".into(), Style::new().fg(colors.red));
+    tokens.insert("number".into(), Style::new().fg(colors.yellow));
+    tokens.insert("property".into(), Style::new().fg(colors.blue));
+    tokens.insert(
+        "punctuation.bracket".into(),
+        Style::new().fg(colors.magenta),
+    );
+    tokens.insert(
+        "punctuation.delimiter".into(),
+        Style::new().fg(colors.magenta),
+    );
+    tokens.insert("string".into(), Style::new().fg(colors.green));
 
     tokens
 }

diff --git a/reqtui/src/syntax/highlighter.rs b/reqtui/src/syntax/highlighter.rs
@@ -43,7 +43,7 @@ impl Default for Highlighter {
 }
 
 impl Highlighter {
-    pub fn parse<'a>(&mut self, buffer: &str) -> Option<Tree> {
+    pub fn parse(&mut self, buffer: &str) -> Option<Tree> {
         self.parser.parse(buffer, None)
     }
 

diff --git a/reqtui/src/text_object/text_object.rs b/reqtui/src/text_object/text_object.rs
@@ -1,9 +1,11 @@
+use std::str::{Chars, FromStr};
+
 use ratatui::{
-    style::Styled,
+    style::{Color, Style, Styled},
     text::{Line, Span},
     widgets::Paragraph,
 };
-use ropey::{iter::Chars, Rope};
+use ropey::Rope;
 
 use crate::syntax::highlighter::ColorInfo;
 
@@ -38,14 +40,10 @@ impl TextObject<Readonly> {
 }
 
 impl TextObject {
-    pub fn chars(&self) -> Chars<'_> {
-        self.content.chars()
-    }
-
     pub fn with_highlight(self, colors: Vec<ColorInfo>) -> Self {
         let mut lines: Vec<Line> = vec![];
         let mut current_line: Vec<Span> = vec![];
-        for (idx, c) in self.chars().enumerate() {
+        for (idx, c) in self.to_string().chars().enumerate() {
             let style = colors
                 .iter()
                 .find(|color| color.start <= idx && color.end >= idx)
@@ -69,3 +67,9 @@ impl TextObject {
         }
     }
 }
+
+impl std::fmt::Display for TextObject {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(&self.content.to_string())
+    }
+}