First draft of integrating taplo. Make API reach base_db through syntax crate

Author: alibektas

Cargo.lock

@@ -9,7 +9,10 @@ pub mod fixture;
 use std::panic;
 
 use rustc_hash::FxHashSet;
-use syntax::{ast, Parse, SourceFile, TextRange, TextSize};
+use syntax::{
+    ast::{self, TomlFile},
+    Parse, SourceFile, TextRange, TextSize,
+};
 use triomphe::Arc;
 
 pub use crate::{
@@ -78,6 +81,15 @@ pub trait SourceDatabase: FileLoader + std::fmt::Debug {
     /// The proc macros.
     #[salsa::input]
     fn proc_macros(&self) -> Arc<ProcMacros>;
+
+    #[salsa::invoke(parse_toml_query)]
+    fn parse_toml(&self, file_id: FileId) -> Parse<ast::TomlFile>;
+}
+
+fn parse_toml_query(db: &dyn SourceDatabase, file_id: FileId) -> Parse<ast::TomlFile> {
+    let _p = profile::span("parse_toml_query").detail(|| format!("{file_id:?}"));
+    let text = db.file_text(file_id);
+    TomlFile::parse(&text)
 }
 
 fn parse_query(db: &dyn SourceDatabase, file_id: FileId) -> Parse<ast::SourceFile> {

crates/base-db/src/lib.rs

@@ -19,6 +19,7 @@ itertools.workspace = true
 rowan = "0.15.11"
 rustc-hash = "1.1.0"
 once_cell = "1.17.0"
+taplo = "0.12.1"
 indexmap.workspace = true
 smol_str.workspace = true
 triomphe.workspace = true

crates/syntax/Cargo.toml

@@ -36,6 +36,11 @@ pub use self::{
     },
 };
 
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct TomlFile {
+    pub(crate) syntax: taplo::syntax::SyntaxNode,
+}
+
 /// The main trait to go from untyped `SyntaxNode`  to a typed ast. The
 /// conversion itself has zero runtime cost: ast and syntax nodes have exactly
 /// the same representation: a pointer to the tree root and a pointer to the

crates/syntax/src/ast.rs

@@ -46,7 +46,10 @@ pub mod hacks;
 
 use std::marker::PhantomData;
 
+pub use taplo;
+
 use stdx::format_to;
+use taplo::parser::Parse as TomlParser;
 use text_edit::Indel;
 use triomphe::Arc;
 
@@ -465,3 +468,20 @@ fn api_walkthrough() {
     }
     assert_eq!(exprs_cast, exprs_visit);
 }
+
+pub use crate::ast::TomlFile;
+
+impl TomlFile {
+    pub fn parse(text: &str) -> Parse<TomlFile> {
+        let TomlParser { green_node, errors } = taplo::parser::parse(text);
+        let root = taplo::syntax::SyntaxNode::new_root(green_node.clone());
+
+        // FIXME : Express this in taplo terms.
+        // parsed.errors.extend(validation::validate(&root));
+
+        assert_eq!(root.kind(), taplo::syntax::SyntaxKind::ROOT);
+        let errs: Vec<SyntaxError> = errors.into_iter().map(SyntaxError::from).collect();
+
+        Parse { green: green_node, errors: errs.into(), _ty: PhantomData }
+    }
+}

crates/syntax/src/lib.rs

@@ -9,6 +9,12 @@ use crate::{TextRange, TextSize};
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct SyntaxError(String, TextRange);
 
+impl From<taplo::parser::Error> for SyntaxError {
+    fn from(value: taplo::parser::Error) -> Self {
+        Self { 0: value.message, 1: value.range }
+    }
+}
+
 // FIXME: there was an unused SyntaxErrorKind previously (before this enum was removed)
 // It was introduced in this PR: https://github.com/rust-lang/rust-analyzer/pull/846/files#diff-827da9b03b8f9faa1bade5cdd44d5dafR95
 // but it was not removed by a mistake.