Skip to content

chore: add our own text-size #235

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.

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

Merged
merged 2 commits into from
Mar 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
69 changes: 39 additions & 30 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ enumflags2 = "0.7.10"
ignore = "0.4.23"
indexmap = { version = "2.6.0", features = ["serde"] }
insta = "1.31.0"
line_index = { path = "./lib/line_index", version = "0.0.0" }
pg_query = "6.0.0"
proc-macro2 = "1.0.66"
quote = "1.0.33"
Expand All @@ -39,7 +38,6 @@ smallvec = { version = "1.13.2", features = ["union", "const_new
sqlx = { version = "0.8.2", features = ["runtime-async-std", "tls-rustls", "postgres", "json"] }
syn = "1.0.109"
termcolor = "1.4.1"
text-size = "1.1.1"
tokio = { version = "1.40.0", features = ["full"] }
toml = "0.8.19"
tower-lsp = "0.20.0"
Expand Down Expand Up @@ -75,6 +73,7 @@ pglt_query_proto_parser = { path = "./crates/pglt_query_proto_parser", versi
pglt_schema_cache = { path = "./crates/pglt_schema_cache", version = "0.0.0" }
pglt_statement_splitter = { path = "./crates/pglt_statement_splitter", version = "0.0.0" }
pglt_text_edit = { path = "./crates/pglt_text_edit", version = "0.0.0" }
pglt_text_size = { path = "./crates/pglt_text_size", version = "0.0.0" }
pglt_treesitter_queries = { path = "./crates/pglt_treesitter_queries", version = "0.0.0" }
pglt_type_resolver = { path = "./crates/pglt_type_resolver", version = "0.0.0" }
pglt_typecheck = { path = "./crates/pglt_typecheck", version = "0.0.0" }
Expand Down
2 changes: 1 addition & 1 deletion crates/pglt_analyse/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ rustc-hash = { workspace = true }
biome_deserialize = { workspace = true, optional = true }
biome_deserialize_macros = { workspace = true, optional = true }
enumflags2.workspace = true
pglt_text_size.workspace = true
schemars = { workspace = true, optional = true }
serde = { workspace = true, features = ["derive"], optional = true }
text-size.workspace = true

[features]
serde = ["dep:serde", "dep:schemars", "dep:biome_deserialize", "dep:biome_deserialize_macros"]
2 changes: 1 addition & 1 deletion crates/pglt_analyse/src/rule.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ use pglt_diagnostics::{
Advices, Category, Diagnostic, DiagnosticTags, Location, LogCategory, MessageAndDescription,
Visit,
};
use pglt_text_size::TextRange;
use std::cmp::Ordering;
use std::fmt::Debug;
use text_size::TextRange;

use crate::{categories::RuleCategory, context::RuleContext, registry::RegistryVisitor};

Expand Down
8 changes: 4 additions & 4 deletions crates/pglt_commands/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ version = "0.0.0"


[dependencies]
anyhow = "1.0.62"
async-std = "1.12.0"
sqlx.workspace = true
text-size.workspace = true
anyhow = "1.0.62"
async-std = "1.12.0"
pglt_text_size.workspace = true
sqlx.workspace = true

[lib]
doctest = false
Expand Down
2 changes: 1 addition & 1 deletion crates/pglt_completions/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ version = "0.0.0"
[dependencies]
async-std = "1.12.0"

text-size.workspace = true
pglt_text_size.workspace = true


pglt_schema_cache.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/pglt_completions/src/complete.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use pglt_text_size::TextSize;
use serde::{Deserialize, Serialize};
use text_size::TextSize;

use crate::{
builder::CompletionBuilder,
Expand Down
2 changes: 1 addition & 1 deletion crates/pglt_configuration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ pglt_analyse = { workspace = true }
pglt_analyser = { workspace = true }
pglt_console = { workspace = true }
pglt_diagnostics = { workspace = true }
pglt_text_size = { workspace = true }
rustc-hash = { workspace = true }
schemars = { workspace = true, features = ["indexmap1"], optional = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true, features = ["raw_value"] }
text-size = { workspace = true }
toml = { workspace = true }

[lib]
Expand Down
4 changes: 2 additions & 2 deletions crates/pglt_console/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ version = "0.0.0"


[dependencies]
pglt_markup = { workspace = true }
text-size = { workspace = true }
pglt_markup = { workspace = true }
pglt_text_size = { workspace = true }

schemars = { workspace = true, optional = true }
serde = { workspace = true, optional = true, features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/pglt_console/src/markup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ use std::{
io,
};

use pglt_text_size::TextSize;
use termcolor::{Color, ColorSpec};
use text_size::TextSize;

use crate::fmt::{Display, Formatter, MarkupElements, Write};

Expand Down
2 changes: 1 addition & 1 deletion crates/pglt_diagnostics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ pglt_console = { workspace = true, features = ["serde_markup"] }
pglt_diagnostics_categories = { workspace = true, features = ["serde"] }
pglt_diagnostics_macros = { workspace = true }
pglt_text_edit = { workspace = true }
pglt_text_size.workspace = true
schemars = { workspace = true, optional = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
termcolor = { workspace = true }
text-size.workspace = true
unicode-width = { workspace = true }

[features]
Expand Down
2 changes: 1 addition & 1 deletion crates/pglt_diagnostics/src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ mod internal {

use pglt_console::{fmt, markup};
use pglt_text_edit::TextEdit;
use text_size::TextRange;
use pglt_text_size::TextRange;

use crate::{
Advices, Backtrace, Category, Diagnostic, DiagnosticTags, LineIndex, LineIndexBuf,
Expand Down
2 changes: 1 addition & 1 deletion crates/pglt_diagnostics/src/display.rs
Original file line number Diff line number Diff line change
Expand Up @@ -669,8 +669,8 @@ mod tests {
use pglt_diagnostics::{DiagnosticTags, Severity};
use pglt_diagnostics_categories::{Category, category};
use pglt_text_edit::TextEdit;
use pglt_text_size::{TextRange, TextSize};
use serde_json::{from_value, json};
use text_size::{TextRange, TextSize};

use crate::{self as pglt_diagnostics};
use crate::{
Expand Down
2 changes: 1 addition & 1 deletion crates/pglt_diagnostics/src/display/frame.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::{
};

use pglt_console::{fmt, markup};
use text_size::{TextLen, TextRange, TextSize};
use pglt_text_size::{TextLen, TextRange, TextSize};
use unicode_width::UnicodeWidthChar;

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion crates/pglt_diagnostics/src/display_github.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::display::frame::SourceFile;
use crate::{Diagnostic, Resource, Severity, diagnostic::internal::AsDiagnostic};
use pglt_console::{MarkupBuf, fmt, markup};
use pglt_text_size::{TextRange, TextSize};
use std::io;
use text_size::{TextRange, TextSize};

/// Helper struct for printing a diagnostic as markup into any formatter
/// implementing [pglt_console::fmt::Write].
Expand Down
Loading