fix some comment formatting and lsp spans

Author: kaikalii

parser/src/ast.rs

@@ -1,6 +1,6 @@
 //! Uiua's abstract syntax tree
 
-use std::{collections::HashMap, fmt, mem::discriminant};
+use std::{collections::BTreeMap, fmt, mem::discriminant};
 
 use ecow::EcoString;
 use serde::*;
@@ -311,7 +311,7 @@ pub struct Comments {
     /// The normal comment lines
     pub lines: Vec<Sp<EcoString>>,
     /// The semantic comments
-    pub semantic: HashMap<SemanticComment, CodeSpan>,
+    pub semantic: BTreeMap<SemanticComment, CodeSpan>,
 }
 
 /// An inline macro

parser/src/lex.rs

@@ -829,10 +829,10 @@ impl From<SemanticComment> for Token {
 pub enum SemanticComment {
     /// Allow experimental features
     Experimental,
-    /// Prevent the containing function from being inlined
-    NoInline,
     /// Prevent stack traces from going deeper
     TrackCaller,
+    /// Prevent the containing function from being inlined
+    NoInline,
     /// Mark that a function should be bound externally
     External,
     /// Mark a function as deprecated

parser/src/parse.rs

@@ -1,7 +1,7 @@
 //! The Uiua parser
 
 use std::{
-    collections::HashMap,
+    collections::BTreeMap,
     error::Error,
     f64::consts::{PI, TAU},
     fmt,
@@ -1746,14 +1746,13 @@ impl Parser<'_> {
     }
     fn comments(&mut self) -> Option<Comments> {
         let mut lines = Vec::new();
-        let mut semantic = HashMap::new();
+        let mut semantic = BTreeMap::new();
         loop {
             self.ignore_whitespace();
             if let Some(span) = self.exact(Comment) {
                 let s = span.as_str(self.inputs, |s| s.trim_start_matches("#").trim().into());
                 lines.push(span.sp(s));
             } else if let Some(sem) = self.next_token_map(Token::as_semantic_comment) {
-                lines.push(sem.span.clone().sp(sem.value.to_string().into()));
                 semantic.insert(sem.value, sem.span);
             } else {
                 break;

src/lsp.rs

@@ -381,6 +381,9 @@ impl Spanner {
                                     for line in &comments.lines {
                                         spans.push(line.span.clone().sp(SpanKind::Comment));
                                     }
+                                    for span in comments.semantic.values() {
+                                        spans.push(span.clone().sp(SpanKind::Comment));
+                                    }
                                 }
                                 spans.push(field.name.span.clone().sp(SpanKind::Ident {
                                     docs: self.binding_docs(&field.name.span),