language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-29 05:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Replace row/column based Location with byte-offsets. (#3931)

Browse source
This commit is contained in:
Micha Reiser 2023-04-26 20:11:02 +02:00 • committed by GitHub
parent ee91598835
commit cab65b25da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
418 changed files with 6203 additions and 7040 deletions
Download patch file Download diff file Expand all files Collapse all files

37
crates/ruff_cli/src/cache.rs
View file

@ -8,12 +8,13 @@ use anyhow::Result;
use filetime::FileTime;
use log::error;
use path_absolutize::Absolutize;
use ruff::message::{Location, Message};
use ruff::message::Message;
use ruff::settings::{flags, AllSettings, Settings};
use ruff_cache::{CacheKey, CacheKeyHasher};
use ruff_diagnostics::{DiagnosticKind, Fix};
use ruff_python_ast::imports::ImportMap;
use ruff_python_ast::source_code::SourceFileBuilder;
use ruff_text_size::{TextRange, TextSize};
use serde::ser::{SerializeSeq, SerializeStruct};
use serde::{Deserialize, Serialize, Serializer};
#[cfg(unix)]
@ -22,8 +23,8 @@ use std::os::unix::fs::PermissionsExt;
const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
/// Vec storing all source files. The tuple is (filename, source code).
type Files<'a> = Vec<(&'a str, Option<&'a str>)>;
type FilesBuf = Vec<(String, Option<String>)>;
type Files<'a> = Vec<(&'a str, &'a str)>;
type FilesBuf = Vec<(String, String)>;
struct CheckResultRef<'a> {
imports: &'a ImportMap,
@ -100,19 +101,17 @@ impl Serialize for SerializeMessage<'_> {
{
let Message {
kind,
location,
end_location,
range,
fix,
// Serialized manually for all files
file: _,
noqa_row,
noqa_offset: noqa_row,
} = self.message;
let mut s = serializer.serialize_struct("Message", 6)?;
let mut s = serializer.serialize_struct("Message", 5)?;
s.serialize_field("kind", &kind)?;
s.serialize_field("location", &location)?;
s.serialize_field("end_location", &end_location)?;
s.serialize_field("range", &range)?;
s.serialize_field("fix", &fix)?;
s.serialize_field("file_id", &self.file_id)?;
s.serialize_field("noqa_row", &noqa_row)?;
@ -124,11 +123,10 @@ impl Serialize for SerializeMessage<'_> {
#[derive(Deserialize)]
struct MessageHeader {
kind: DiagnosticKind,
location: Location,
end_location: Location,
range: TextRange,
fix: Fix,
file_id: usize,
noqa_row: usize,
noqa_row: TextSize,
}
#[derive(Deserialize)]
@ -223,15 +221,7 @@ pub fn get(
let source_files: Vec<_> = sources
.into_iter()
.map(|(filename, text)| {
let mut builder = SourceFileBuilder::from_string(filename);
if let Some(text) = text {
builder.set_source_text_string(text);
}
builder.finish()
})
.map(|(filename, text)| SourceFileBuilder::new(filename, text).finish())
.collect();
for header in headers {
@ -242,11 +232,10 @@ pub fn get(
messages.push(Message {
kind: header.kind,
location: header.location,
end_location: header.end_location,
range: header.range,
fix: header.fix,
file: source_file.clone(),
noqa_row: header.noqa_row,
noqa_offset: header.noqa_row,
});
}