Move rls-span crate

Based on
rust-dev-tools/rls-span@45700a3

Author: Xanewok

Cargo.toml

@@ -25,6 +25,7 @@ rls-analysis = "0.16.12"
 rls-blacklist = "0.1.3"
 rls-data = { version = "0.18.2", features = ["serialize-serde", "serialize-rustc"] }
 rls-rustc = "0.5.0"
+rls-span = { version = "0.4", features = ["serialize-serde"] }
 
 cargo = { git = "https://github.com/rust-lang/cargo", rev = "4e74e2fc0908524d17735c768067117d3e84ee9c" }
 cargo_metadata = "0.7"
@@ -41,7 +42,6 @@ num_cpus = "1"
 racer = { version = "=2.1.18", default-features = false }
 rand = "0.6"
 rayon = "1"
-rls-span = { version = "0.4", features = ["serialize-serde"] }
 rls-vfs = "0.7"
 rustc_tools_util = "0.1.1"
 rustfmt-nightly = "1.0.1"

rls-span/.gitignore

@@ -0,0 +1,2 @@
+target
+Cargo.lock

rls-span/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "rls-span"
+version = "0.4.1"
+authors = ["Nick Cameron <ncameron@mozilla.com>"]
+description = "Types for identifying code spans/ranges"
+license = "Apache-2.0/MIT"
+repository = "https://github.com/rust-dev-tools/rls-span"
+categories = ["development-tools"]
+
+[features]
+default = []
+serialize-serde = ["serde", "serde_derive"]
+serialize-rustc = ["rustc-serialize"]
+
+[dependencies]
+rustc-serialize = { version = "0.3", optional = true }
+serde = { version = "1.0", optional = true }
+serde_derive = { version = "1.0", optional = true }

rls-span/src/compiler.rs

@@ -0,0 +1,81 @@
+// Copyright 2016 The RLS Project Developers.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+/// These are the structures emitted by the compiler as part of JSON errors.
+/// The original source can be found at
+/// https://github.com/rust-lang/rust/blob/master/src/libsyntax/json.rs
+
+use std::path::PathBuf;
+
+use {Span, Row, Column, OneIndexed};
+
+#[cfg_attr(feature = "serialize-serde", derive(Deserialize))]
+#[derive(Debug, Clone)]
+pub struct DiagnosticSpan {
+    pub file_name: String,
+    pub byte_start: u32,
+    pub byte_end: u32,
+    /// 1-based.
+    pub line_start: usize,
+    pub line_end: usize,
+    /// 1-based, character offset.
+    pub column_start: usize,
+    pub column_end: usize,
+    /// Is this a "primary" span -- meaning the point, or one of the points,
+    /// where the error occurred?
+    pub is_primary: bool,
+    /// Source text from the start of line_start to the end of line_end.
+    pub text: Vec<DiagnosticSpanLine>,
+    /// Label that should be placed at this location (if any)
+    pub label: Option<String>,
+    /// If we are suggesting a replacement, this will contain text
+    /// that should be sliced in atop this span. You may prefer to
+    /// load the fully rendered version from the parent `Diagnostic`,
+    /// however.
+    pub suggested_replacement: Option<String>,
+    /// Macro invocations that created the code at this span, if any.
+    pub expansion: Option<Box<DiagnosticSpanMacroExpansion>>,
+}
+
+impl DiagnosticSpan {
+    pub fn rls_span(&self) -> Span<OneIndexed> {
+        Span::new(
+            Row::new(self.line_start as u32),
+            Row::new(self.line_end as u32),
+            Column::new(self.column_start as u32),
+            Column::new(self.column_end as u32),
+            PathBuf::from(&self.file_name),
+        )
+    }
+}
+
+#[cfg_attr(feature = "serialize-serde", derive(Deserialize))]
+#[derive(Debug, Clone)]
+pub struct DiagnosticSpanLine {
+    pub text: String,
+
+    /// 1-based, character offset in self.text.
+    pub highlight_start: usize,
+
+    pub highlight_end: usize,
+}
+
+#[cfg_attr(feature = "serialize-serde", derive(Deserialize))]
+#[derive(Debug, Clone)]
+pub struct DiagnosticSpanMacroExpansion {
+    /// span where macro was applied to generate this code; note that
+    /// this may itself derive from a macro (if
+    /// `span.expansion.is_some()`)
+    pub span: DiagnosticSpan,
+
+    /// name of macro that was applied (e.g., "foo!" or "#[derive(Eq)]")
+    pub macro_decl_name: String,
+
+    /// span where macro was defined (if known)
+    pub def_site_span: Option<DiagnosticSpan>,
+}