From 3171b65646f09d77afc81a073a1c989429c7f1d8 Mon Sep 17 00:00:00 2001 From: Sophie Atkins Date: Thu, 20 Jun 2024 17:41:07 +0200 Subject: [PATCH] clean up offsets import --- prisma-fmt/src/hover.rs | 4 ++-- prisma-fmt/src/lib.rs | 3 ++- prisma-fmt/tests/code_actions/test_api.rs | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/prisma-fmt/src/hover.rs b/prisma-fmt/src/hover.rs index d39b2d665266..6290432622ec 100644 --- a/prisma-fmt/src/hover.rs +++ b/prisma-fmt/src/hover.rs @@ -7,7 +7,7 @@ use psl::{ Diagnostics, SourceFile, }; -use crate::LSPContext; +use crate::{offsets::position_to_offset, LSPContext}; pub(super) type HoverContext<'a> = LSPContext<'a, HoverParams>; @@ -16,7 +16,7 @@ impl<'a> HoverContext<'a> { let pos = self.params.text_document_position_params.position; let initiating_doc = self.initiating_file_source(); - super::position_to_offset(&pos, initiating_doc) + position_to_offset(&pos, initiating_doc) } } diff --git a/prisma-fmt/src/lib.rs b/prisma-fmt/src/lib.rs index dc4bc60f0b4a..3a5fd1783e85 100644 --- a/prisma-fmt/src/lib.rs +++ b/prisma-fmt/src/lib.rs @@ -6,12 +6,13 @@ mod hover; mod lint; mod merge_schemas; mod native; -mod offsets; mod preview; mod schema_file_input; mod text_document_completion; mod validate; +pub mod offsets; + use log::*; use psl::{ datamodel_connector::Connector, diagnostics::FileId, parser_database::ParserDatabase, Configuration, Datasource, diff --git a/prisma-fmt/tests/code_actions/test_api.rs b/prisma-fmt/tests/code_actions/test_api.rs index 396dfd103a2c..b09f517be9c5 100644 --- a/prisma-fmt/tests/code_actions/test_api.rs +++ b/prisma-fmt/tests/code_actions/test_api.rs @@ -1,6 +1,7 @@ use lsp_types::{Diagnostic, DiagnosticSeverity}; use once_cell::sync::Lazy; -use prisma_fmt::span_to_range; + +use prisma_fmt::offsets::span_to_range; use psl::{diagnostics::Span, SourceFile}; use std::{fmt::Write as _, io::Write as _, path::PathBuf};