Merge branch 'default' into cli-highlight

goto-bus-stop · goto-bus-stop · commit 7ddfa870cdd2 · 2020-03-23T11:05:04.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -77,10 +77,9 @@ jobs:
           profile: minimal
           toolchain: stable
           override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: wasm-pack
+      - name: Install wasm-pack
+        run: |
+          curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
       - run: npm install
         working-directory: vscode
       - run: npm run package
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,8 +16,8 @@ lto = true
 
 [dependencies]
 ansi_term = "0.12"
-codespan = "0.8"
-codespan-reporting = "0.8"
+codespan = "0.9"
+codespan-reporting = "0.9"
 failure = "0.1"
 multisplice = "^0.3.0"
 rms-check = { path = "crates/rms-check" }
diff --git a/crates/rms-check-lsp/Cargo.toml b/crates/rms-check-lsp/Cargo.toml
@@ -8,11 +8,11 @@ repository = "https://github.com/goto-bus-stop/rms-check.git"
 edition = "2018"
 
 [dependencies]
-codespan = "0.8"
-codespan-lsp = "0.8"
+codespan = "0.9"
+codespan-lsp = "0.9"
 jsonrpc-core = "14.0"
 lazy_static = "1.4"
-lsp-types = "0.70"
+lsp-types = "0.73"
 multisplice = "0.3"
 rms-check = { path = "../rms-check/" }
 serde_json = "1.0"
diff --git a/crates/rms-check-lsp/src/lib.rs b/crates/rms-check-lsp/src/lib.rs
@@ -13,16 +13,17 @@ use codespan_lsp::range_to_byte_span;
 use jsonrpc_core::{ErrorCode, IoHandler, Params};
 use lsp_types::{
     CodeAction, CodeActionParams, CodeActionProviderCapability, Diagnostic,
-    DidChangeTextDocumentParams, DidCloseTextDocumentParams, DidOpenTextDocumentParams,
-    DocumentFormattingParams, FoldingRange, FoldingRangeParams, FoldingRangeProviderCapability,
-    InitializeParams, InitializeResult, NumberOrString, PublishDiagnosticsParams,
-    ServerCapabilities, ServerInfo, SignatureHelpOptions, TextDocumentItem,
-    TextDocumentPositionParams, TextDocumentSyncCapability, TextDocumentSyncKind, TextEdit, Url,
-    WorkDoneProgressOptions, WorkspaceEdit,
+    DiagnosticRelatedInformation, DiagnosticSeverity, DidChangeTextDocumentParams,
+    DidCloseTextDocumentParams, DidOpenTextDocumentParams, DocumentFormattingParams, FoldingRange,
+    FoldingRangeParams, FoldingRangeProviderCapability, InitializeParams, InitializeResult,
+    Location, NumberOrString, PublishDiagnosticsParams, ServerCapabilities, ServerInfo,
+    SignatureHelpOptions, TextDocumentItem, TextDocumentPositionParams, TextDocumentSyncCapability,
+    TextDocumentSyncKind, TextEdit, Url, WorkDoneProgressOptions, WorkspaceEdit,
 };
 use multisplice::Multisplice;
 use rms_check::{
-    AutoFixReplacement, Compatibility, FormatOptions, RMSCheck, RMSCheckResult, RMSFile, Warning,
+    AutoFixReplacement, Compatibility, FormatOptions, RMSCheck, RMSCheckResult, RMSFile, Severity,
+    Warning,
 };
 use serde_json::{self, json};
 use std::borrow::Cow;
@@ -47,20 +48,47 @@ impl<Emit> Inner<Emit>
 where
     Emit: Fn(serde_json::Value) + Send + 'static,
 {
-    /// Convert a codespan file name to an LSP file URL.
-    fn codespan_name_to_url(&self, filename: &str) -> Result<Url, ()> {
-        filename.parse().map_err(|_| ())
-    }
-
     /// Convert an rms-check warning to an LSP diagnostic.
     fn make_lsp_diagnostic(&self, files: &Files<Cow<'_, str>>, warn: &Warning) -> Diagnostic {
-        let diag = codespan_lsp::make_lsp_diagnostic(
-            files,
-            "rms-check".to_string(),
-            warn.diagnostic().clone(),
-            |f| self.codespan_name_to_url(files.name(f).to_string_lossy().as_ref()),
-        )
-        .expect("could not convert diagnostic to lsp");
+        let main_label = warn.main_label();
+        let span = Span::new(main_label.range.start as u32, main_label.range.end as u32);
+        let more_labels = warn.labels();
+
+        let diag = Diagnostic {
+            range: codespan_lsp::byte_span_to_range(files, main_label.file_id, span).unwrap(),
+            severity: Some(match warn.severity() {
+                Severity::Bug => DiagnosticSeverity::Error,
+                Severity::Error => DiagnosticSeverity::Error,
+                Severity::Warning => DiagnosticSeverity::Warning,
+                Severity::Note => DiagnosticSeverity::Information,
+                Severity::Help => DiagnosticSeverity::Hint,
+            }),
+            source: Some("rms-check".into()),
+            code: warn
+                .diagnostic()
+                .code
+                .clone()
+                .map(lsp_types::NumberOrString::String),
+            message: warn.message().into(),
+            related_information: Some(
+                more_labels
+                    .iter()
+                    .map(|label| DiagnosticRelatedInformation {
+                        location: Location {
+                            uri: files.name(label.file_id).to_string_lossy().parse().unwrap(),
+                            range: codespan_lsp::byte_span_to_range(
+                                files,
+                                label.file_id,
+                                Span::new(label.range.start as u32, label.range.end as u32),
+                            )
+                            .unwrap(),
+                        },
+                        message: label.message.clone(),
+                    })
+                    .collect(),
+            ),
+            tags: None,
+        };
 
         Diagnostic {
             code: warn
@@ -166,9 +194,8 @@ where
             .map_err(|_| jsonrpc_core::Error::new(ErrorCode::InternalError))?;
 
         let warnings = result.iter().filter(|warn| {
-            let label = &warn.diagnostic().primary_label;
-            start >= label.span.start() && start <= label.span.end()
-                || end >= label.span.start() && end <= label.span.end()
+            let label = &warn.diagnostic().labels[0];
+            label.range.contains(&start.to_usize()) && label.range.contains(&end.to_usize())
         });
 
         let mut actions = vec![];
diff --git a/crates/rms-check/Cargo.toml b/crates/rms-check/Cargo.toml
@@ -9,8 +9,8 @@ edition = "2018"
 
 [dependencies]
 chardet = "0.2"
-codespan = "0.8"
-codespan-reporting = "0.8"
+codespan = "0.9"
+codespan-reporting = "0.9"
 encoding_rs = "0.8"
 itertools = "0.9"
 lazy_static = "1.4"
diff --git a/crates/rms-check/src/checker.rs b/crates/rms-check/src/checker.rs
@@ -5,8 +5,22 @@ use crate::state::{Compatibility, ParseState};
 use crate::wordize::Word;
 use crate::RMSFile;
 use codespan::{ByteIndex, FileId, Span};
-pub use codespan_reporting::diagnostic::{Diagnostic, Label, Severity};
+use codespan_reporting::diagnostic::LabelStyle;
+pub use codespan_reporting::diagnostic::Severity;
 use lazy_static::lazy_static;
+use std::ops::Range;
+
+/// Represents a diagnostic message that can provide information like errors and warnings to the user.
+pub type Diagnostic = codespan_reporting::diagnostic::Diagnostic<FileId>;
+/// A label describing an underlined region of code associated with a diagnostic.
+pub type Label = codespan_reporting::diagnostic::Label<FileId>;
+
+fn span_to_range(span: Span) -> Range<usize> {
+    Range {
+        start: span.start().to_usize(),
+        end: span.end().to_usize(),
+    }
+}
 
 #[derive(Debug, Clone)]
 pub enum AutoFixReplacement {
@@ -103,7 +117,7 @@ impl Suggestion {
 }
 
 /// A warning.
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct Warning {
     diagnostic: Diagnostic,
     /// A change suggestion: when present, the problem can be fixed by replacing the
@@ -120,9 +134,12 @@ impl Warning {
     pub const fn severity(&self) -> Severity {
         self.diagnostic.severity
     }
+    pub fn main_label(&self) -> &Label {
+        &self.diagnostic.labels[0]
+    }
     /// Get additional labels for this warning.
-    pub const fn labels(&self) -> &Vec<Label> {
-        &self.diagnostic.secondary_labels
+    pub fn labels(&self) -> &[Label] {
+        &self.diagnostic.labels[1..]
     }
     /// Get the human-readable error message.
     pub fn message(&self) -> &str {
@@ -143,10 +160,14 @@ impl Warning {
     pub(crate) fn warning(file_id: FileId, span: Span, message: impl Into<String>) -> Self {
         let message: String = message.into();
         Warning {
-            diagnostic: Diagnostic::new_warning(
-                message.clone(),
-                Label::new(file_id, span, message),
-            ),
+            diagnostic: Diagnostic::warning()
+                .with_message(message.clone())
+                .with_labels(vec![Label::new(
+                    LabelStyle::Primary,
+                    file_id,
+                    span_to_range(span),
+                )
+                .with_message(message)]),
             suggestions: vec![],
         }
     }
@@ -156,7 +177,14 @@ impl Warning {
     pub(crate) fn error(file_id: FileId, span: Span, message: impl Into<String>) -> Self {
         let message: String = message.into();
         Warning {
-            diagnostic: Diagnostic::new_error(message.clone(), Label::new(file_id, span, message)),
+            diagnostic: Diagnostic::error()
+                .with_message(message.clone())
+                .with_labels(vec![Label::new(
+                    LabelStyle::Primary,
+                    file_id,
+                    span_to_range(span),
+                )
+                .with_message(message)]),
             suggestions: vec![],
         }
     }
@@ -169,9 +197,9 @@ impl Warning {
 
     /// Add a note referencing a snippet of code.
     pub(crate) fn note_at(mut self, file_id: FileId, span: Span, message: &str) -> Self {
-        self.diagnostic = self
-            .diagnostic
-            .with_secondary_labels(vec![Label::new(file_id, span, message)]);
+        self.diagnostic.labels.push(
+            Label::new(LabelStyle::Secondary, file_id, span_to_range(span)).with_message(message),
+        );
         self
     }
 
@@ -188,10 +216,14 @@ impl Word<'_> {
     pub(crate) fn warning(&self, message: impl Into<String>) -> Warning {
         let message: String = message.into();
         Warning {
-            diagnostic: Diagnostic::new_warning(
-                message.clone(),
-                Label::new(self.file, self.span, message),
-            ),
+            diagnostic: Diagnostic::warning()
+                .with_message(message.clone())
+                .with_labels(vec![Label::new(
+                    LabelStyle::Primary,
+                    self.file,
+                    span_to_range(self.span),
+                )
+                .with_message(message)]),
             suggestions: vec![],
         }
     }
@@ -200,10 +232,14 @@ impl Word<'_> {
     pub(crate) fn error(&self, message: impl Into<String>) -> Warning {
         let message: String = message.into();
         Warning {
-            diagnostic: Diagnostic::new_error(
-                message.clone(),
-                Label::new(self.file, self.span, message),
-            ),
+            diagnostic: Diagnostic::error()
+                .with_message(message.clone())
+                .with_labels(vec![Label::new(
+                    LabelStyle::Primary,
+                    self.file,
+                    span_to_range(self.span),
+                )
+                .with_message(message)]),
             suggestions: vec![],
         }
     }
@@ -215,10 +251,14 @@ impl Atom<'_> {
     pub(crate) fn warning(&self, message: impl Into<String>) -> Warning {
         let message: String = message.into();
         Warning {
-            diagnostic: Diagnostic::new_warning(
-                message.clone(),
-                Label::new(self.file, self.span, message),
-            ),
+            diagnostic: Diagnostic::warning()
+                .with_message(message.clone())
+                .with_labels(vec![Label::new(
+                    LabelStyle::Primary,
+                    self.file,
+                    span_to_range(self.span),
+                )
+                .with_message(message)]),
             suggestions: vec![],
         }
     }
@@ -227,10 +267,14 @@ impl Atom<'_> {
     pub(crate) fn error(&self, message: impl Into<String>) -> Warning {
         let message: String = message.into();
         Warning {
-            diagnostic: Diagnostic::new_error(
-                message.clone(),
-                Label::new(self.file, self.span, message),
-            ),
+            diagnostic: Diagnostic::error()
+                .with_message(message.clone())
+                .with_labels(vec![Label::new(
+                    LabelStyle::Primary,
+                    self.file,
+                    span_to_range(self.span),
+                )
+                .with_message(message)]),
             suggestions: vec![],
         }
     }
diff --git a/crates/rms-check/src/lints/arg_types.rs b/crates/rms-check/src/lints/arg_types.rs
@@ -335,6 +335,11 @@ mod tests {
     use super::*;
     use crate::{Compatibility, RMSCheck, RMSFile, Severity};
     use codespan::{ColumnIndex, LineIndex, Location};
+    use std::ops::Range;
+
+    fn to_span(range: Range<usize>) -> Span {
+        Span::new(range.start as u32, range.end as u32)
+    }
 
     #[test]
     fn is_numeric_test() {
@@ -374,7 +379,7 @@ mod tests {
         assert_eq!(first.diagnostic().severity, Severity::Error);
         assert_eq!(first.diagnostic().code, Some("arg-types".to_string()));
         assert_eq!(first.message(), "Expected a const name, but got a number 0");
-        let first_span = first.diagnostic().primary_label.span;
+        let first_span = to_span(first.diagnostic().labels[0].range.clone());
         assert_eq!(
             result.resolve_position(file, first_span.start()).unwrap(),
             Location::new(LineIndex(1), ColumnIndex(17))
@@ -386,7 +391,7 @@ mod tests {
             second.message(),
             "Expected a const name, but got a number 10"
         );
-        let second_span = second.diagnostic().primary_label.span;
+        let second_span = to_span(second.diagnostic().labels[0].range.clone());
         assert_eq!(
             result.resolve_position(file, second_span.start()).unwrap(),
             Location::new(LineIndex(3), ColumnIndex(13))
@@ -398,7 +403,7 @@ mod tests {
             third.message(),
             "Expected a number argument to number_of_objects, but got SOMEVAL"
         );
-        let third_span = third.diagnostic().primary_label.span;
+        let third_span = to_span(third.diagnostic().labels[0].range.clone());
         assert_eq!(
             result.resolve_position(file, third_span.start()).unwrap(),
             Location::new(LineIndex(7), ColumnIndex(18))
@@ -407,7 +412,7 @@ mod tests {
         assert_eq!(fourth.diagnostic().severity, Severity::Error);
         assert_eq!(fourth.diagnostic().code, Some("arg-types".to_string()));
         assert_eq!(fourth.message(), "Missing arguments to create_object");
-        let fourth_span = fourth.diagnostic().primary_label.span;
+        let fourth_span = to_span(fourth.diagnostic().labels[0].range.clone());
         assert_eq!(
             result.resolve_position(file, fourth_span.start()).unwrap(),
             Location::new(LineIndex(10), ColumnIndex(0))
@@ -429,7 +434,7 @@ mod tests {
         assert_eq!(first.diagnostic().severity, Severity::Warning);
         assert_eq!(first.diagnostic().code, Some("arg-types".to_string()));
         assert_eq!(first.message(), "Elevation value out of range (0 or 1-7)");
-        let first_span = first.diagnostic().primary_label.span;
+        let first_span = to_span(first.diagnostic().labels[0].range.clone());
         assert_eq!(
             result.resolve_position(file, first_span.start()).unwrap(),
             Location::new(LineIndex(0), ColumnIndex(29))
@@ -457,7 +462,7 @@ mod tests {
             first.message(),
             "`assign_to` Target must be AT_COLOR, AT_PLAYER, AT_TEAM"
         );
-        let first_span = first.diagnostic().primary_label.span;
+        let first_span = to_span(first.diagnostic().labels[0].range.clone());
         assert_eq!(
             result.resolve_position(file, first_span.start()).unwrap(),
             Location::new(LineIndex(0), ColumnIndex(24))
diff --git a/crates/rms-check/src/lints/include.rs b/crates/rms-check/src/lints/include.rs
