Move SyntaxTree to syntax module

latex-lsp · May 13, 2019 · f60b0f5 · f60b0f5
1 parent 90e512e
commit f60b0f5
Show file tree

Hide file tree

Showing 23 changed files with 68 additions and 62 deletions.
diff --git a/src/completion/latex/citation.rs b/src/completion/latex/citation.rs
@@ -3,7 +3,7 @@ use crate::completion::latex::combinators::LatexCombinators;
 use crate::feature::FeatureRequest;
 use crate::syntax::bibtex::BibtexDeclaration;
 use crate::syntax::latex::CITATION_COMMANDS;
-use crate::workspace::SyntaxTree;
+use crate::syntax::SyntaxTree;
 use lsp_types::{CompletionItem, CompletionParams};
 
 pub struct LatexCitationCompletionProvider;

diff --git a/src/completion/latex/combinators.rs b/src/completion/latex/combinators.rs
@@ -1,7 +1,6 @@
 use crate::feature::FeatureRequest;
 use crate::syntax::latex::*;
-use crate::syntax::text::SyntaxNode;
-use crate::workspace::SyntaxTree;
+use crate::syntax::SyntaxTree;
 use lsp_types::{CompletionItem, CompletionParams};
 
 pub struct LatexCombinators;

diff --git a/src/completion/latex/data/types.rs b/src/completion/latex/data/types.rs
@@ -1,5 +1,6 @@
 use crate::syntax::latex::{LatexIncludeAnalyzer, LatexVisitor};
-use crate::workspace::{Document, SyntaxTree};
+use crate::syntax::SyntaxTree;
+use crate::workspace::Document;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;

diff --git a/src/completion/latex/label.rs b/src/completion/latex/label.rs
@@ -2,7 +2,7 @@ use crate::completion::factory;
 use crate::completion::latex::combinators::LatexCombinators;
 use crate::feature::FeatureRequest;
 use crate::syntax::latex::*;
-use crate::workspace::SyntaxTree;
+use crate::syntax::SyntaxTree;
 use lsp_types::{CompletionItem, CompletionParams};
 use std::borrow::Cow;
 

diff --git a/src/completion/latex/user_command.rs b/src/completion/latex/user_command.rs
@@ -4,7 +4,7 @@ use crate::completion::latex::combinators::LatexCombinators;
 use crate::feature::FeatureRequest;
 use crate::syntax::latex::{LatexCommandAnalyzer, LatexVisitor};
 use crate::syntax::text::SyntaxNode;
-use crate::workspace::SyntaxTree;
+use crate::syntax::SyntaxTree;
 use itertools::Itertools;
 use lsp_types::{CompletionItem, CompletionParams};
 use std::borrow::Cow;

diff --git a/src/completion/quality.rs b/src/completion/quality.rs
@@ -2,7 +2,8 @@ use crate::feature::FeatureRequest;
 use crate::syntax::bibtex::*;
 use crate::syntax::latex::*;
 use crate::syntax::text::SyntaxNode;
-use crate::workspace::{Document, SyntaxTree};
+use crate::syntax::SyntaxTree;
+use crate::workspace::Document;
 use lsp_types::{CompletionItem, CompletionParams, Position};
 
 pub struct OrderByQualityCompletionProvider;

diff --git a/src/definition/latex_citation.rs b/src/definition/latex_citation.rs
@@ -2,7 +2,8 @@ use crate::feature::FeatureRequest;
 use crate::syntax::bibtex::BibtexDeclaration;
 use crate::syntax::latex::{LatexCitationAnalyzer, LatexVisitor};
 use crate::syntax::text::SyntaxNode;
-use crate::workspace::{Document, SyntaxTree};
+use crate::syntax::SyntaxTree;
+use crate::workspace::Document;
 use lsp_types::{Location, TextDocumentPositionParams};
 
 pub struct LatexCitationDefinitionProvider;

diff --git a/src/definition/latex_label.rs b/src/definition/latex_label.rs
@@ -1,7 +1,8 @@
 use crate::feature::FeatureRequest;
 use crate::syntax::latex::*;
 use crate::syntax::text::SyntaxNode;
-use crate::workspace::{Document, SyntaxTree};
+use crate::syntax::SyntaxTree;
+use crate::workspace::Document;
 use lsp_types::{Location, TextDocumentPositionParams};
 
 pub struct LatexLabelDefinitionProvider;

diff --git a/src/folding/bibtex_declaration.rs b/src/folding/bibtex_declaration.rs
@@ -1,7 +1,7 @@
 use crate::feature::FeatureRequest;
 use crate::syntax::bibtex::BibtexDeclaration;
 use crate::syntax::text::SyntaxNode;
-use crate::workspace::SyntaxTree;
+use crate::syntax::SyntaxTree;
 use lsp_types::{FoldingRange, FoldingRangeKind, FoldingRangeParams};
 
 pub struct BibtexDeclarationFoldingProvider;

diff --git a/src/folding/latex_environment.rs b/src/folding/latex_environment.rs
@@ -1,7 +1,7 @@
 use crate::feature::FeatureRequest;
 use crate::syntax::latex::{LatexEnvironmentAnalyzer, LatexVisitor};
 use crate::syntax::text::SyntaxNode;
-use crate::workspace::SyntaxTree;
+use crate::syntax::SyntaxTree;
 use lsp_types::{FoldingRange, FoldingRangeKind, FoldingRangeParams};
 
 pub struct LatexEnvironmentFoldingProvider;

diff --git a/src/folding/latex_section.rs b/src/folding/latex_section.rs
@@ -1,7 +1,7 @@
 use crate::feature::FeatureRequest;
 use crate::syntax::latex::{LatexSectionAnalyzer, LatexVisitor};
 use crate::syntax::text::SyntaxNode;
-use crate::workspace::SyntaxTree;
+use crate::syntax::SyntaxTree;
 use lsp_types::{FoldingRange, FoldingRangeKind, FoldingRangeParams};
 
 pub struct LatexSectionFoldingProvider;

diff --git a/src/highlight/latex_label.rs b/src/highlight/latex_label.rs
@@ -1,7 +1,7 @@
 use crate::feature::FeatureRequest;
 use crate::syntax::latex::*;
 use crate::syntax::text::SyntaxNode;
-use crate::workspace::SyntaxTree;
+use crate::syntax::SyntaxTree;
 use lsp_types::{DocumentHighlight, DocumentHighlightKind, TextDocumentPositionParams};
 
 pub struct LatexLabelHighlightProvider;

diff --git a/src/hover/bibtex_field.rs b/src/hover/bibtex_field.rs
@@ -1,7 +1,7 @@
 use crate::feature::FeatureRequest;
 use crate::metadata::bibtex_field;
 use crate::syntax::bibtex::*;
-use crate::workspace::SyntaxTree;
+use crate::syntax::SyntaxTree;
 use lsp_types::*;
 use std::borrow::Cow;
 

diff --git a/src/hover/latex_citation.rs b/src/hover/latex_citation.rs
@@ -3,7 +3,7 @@ use crate::formatting::{BibtexFormatter, BibtexFormattingOptions};
 use crate::syntax::bibtex::{BibtexDeclaration, BibtexEntry};
 use crate::syntax::latex::{LatexCitationAnalyzer, LatexToken, LatexVisitor};
 use crate::syntax::text::SyntaxNode;
-use crate::workspace::SyntaxTree;
+use crate::syntax::SyntaxTree;
 use lsp_types::{Hover, HoverContents, MarkupContent, MarkupKind, TextDocumentPositionParams};
 use std::borrow::Cow;
 

diff --git a/src/link/latex_include.rs b/src/link/latex_include.rs
@@ -1,7 +1,7 @@
 use crate::feature::FeatureRequest;
 use crate::syntax::latex::*;
 use crate::syntax::text::SyntaxNode;
-use crate::workspace::SyntaxTree;
+use crate::syntax::SyntaxTree;
 use lsp_types::{DocumentLink, DocumentLinkParams};
 
 pub struct LatexIncludeLinkProvider;

diff --git a/src/reference/bibtex_entry.rs b/src/reference/bibtex_entry.rs
@@ -2,7 +2,7 @@ use crate::feature::FeatureRequest;
 use crate::syntax::bibtex::BibtexDeclaration;
 use crate::syntax::latex::{LatexCitationAnalyzer, LatexVisitor};
 use crate::syntax::text::SyntaxNode;
-use crate::workspace::SyntaxTree;
+use crate::syntax::SyntaxTree;
 use lsp_types::{Location, ReferenceParams};
 
 pub struct BibtexEntryReferenceProvider;

diff --git a/src/reference/latex_label.rs b/src/reference/latex_label.rs
@@ -1,6 +1,6 @@
 use crate::feature::FeatureRequest;
 use crate::syntax::latex::{LatexLabelAnalyzer, LatexLabelKind, LatexVisitor};
-use crate::workspace::SyntaxTree;
+use crate::syntax::SyntaxTree;
 use lsp_types::{Location, ReferenceParams};
 
 pub struct LatexLabelReferenceProvider;

diff --git a/src/rename/bibtex_entry.rs b/src/rename/bibtex_entry.rs
@@ -2,7 +2,7 @@ use crate::feature::FeatureRequest;
 use crate::syntax::bibtex::{BibtexDeclaration, BibtexSyntaxTree};
 use crate::syntax::latex::{LatexCitationAnalyzer, LatexSyntaxTree, LatexVisitor};
 use crate::syntax::text::SyntaxNode;
-use crate::workspace::SyntaxTree;
+use crate::syntax::SyntaxTree;
 use lsp_types::*;
 use std::borrow::Cow;
 use std::collections::HashMap;

diff --git a/src/rename/latex_command.rs b/src/rename/latex_command.rs
@@ -1,7 +1,7 @@
 use crate::feature::FeatureRequest;
 use crate::syntax::latex::{LatexCommandAnalyzer, LatexVisitor};
 use crate::syntax::text::SyntaxNode;
-use crate::workspace::SyntaxTree;
+use crate::syntax::SyntaxTree;
 use lsp_types::{RenameParams, TextEdit, WorkspaceEdit};
 use std::borrow::Cow;
 use std::collections::HashMap;

diff --git a/src/rename/latex_environment.rs b/src/rename/latex_environment.rs
@@ -1,7 +1,7 @@
 use crate::feature::FeatureRequest;
 use crate::syntax::latex::{LatexEnvironmentAnalyzer, LatexVisitor};
 use crate::syntax::text::SyntaxNode;
-use crate::workspace::SyntaxTree;
+use crate::syntax::SyntaxTree;
 use lsp_types::{RenameParams, TextEdit, WorkspaceEdit};
 use std::borrow::Cow;
 use std::collections::HashMap;

diff --git a/src/rename/latex_label.rs b/src/rename/latex_label.rs
@@ -1,7 +1,7 @@
 use crate::feature::FeatureRequest;
 use crate::syntax::latex::{LatexLabelAnalyzer, LatexVisitor};
 use crate::syntax::text::SyntaxNode;
-use crate::workspace::SyntaxTree;
+use crate::syntax::SyntaxTree;
 use lsp_types::{RenameParams, TextEdit, WorkspaceEdit};
 use std::borrow::Cow;
 use std::collections::HashMap;

diff --git a/src/syntax/mod.rs b/src/syntax/mod.rs
@@ -1,3 +1,45 @@
 pub mod bibtex;
 pub mod latex;
 pub mod text;
+
+use crate::syntax::bibtex::BibtexSyntaxTree;
+use crate::syntax::latex::LatexSyntaxTree;
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub enum Language {
+    Latex,
+    Bibtex,
+}
+
+impl Language {
+    pub fn by_extension(extension: &str) -> Option<Self> {
+        match extension.to_lowercase().as_ref() {
+            "tex" | "sty" | "cls" => Some(Language::Latex),
+            "bib" => Some(Language::Bibtex),
+            _ => None,
+        }
+    }
+
+    pub fn by_language_id(language_id: &str) -> Option<Self> {
+        match language_id {
+            "latex" => Some(Language::Latex),
+            "bibtex" => Some(Language::Bibtex),
+            _ => None,
+        }
+    }
+}
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum SyntaxTree {
+    Latex(LatexSyntaxTree),
+    Bibtex(BibtexSyntaxTree),
+}
+
+impl SyntaxTree {
+    pub fn parse(text: &str, language: Language) -> Self {
+        match language {
+            Language::Latex => SyntaxTree::Latex(LatexSyntaxTree::from(text)),
+            Language::Bibtex => SyntaxTree::Bibtex(BibtexSyntaxTree::from(text)),
+        }
+    }
+}
diff --git a/src/workspace.rs b/src/workspace.rs
@@ -1,5 +1,5 @@
-use crate::syntax::bibtex::BibtexSyntaxTree;
 use crate::syntax::latex::*;
+use crate::syntax::{Language, SyntaxTree};
 use log::*;
 use lsp_types::{TextDocumentItem, Uri};
 use path_clean::PathClean;
@@ -8,45 +8,6 @@ use std::fs;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex};
 
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum Language {
-    Latex,
-    Bibtex,
-}
-
-impl Language {
-    pub fn by_extension(extension: &str) -> Option<Self> {
-        match extension.to_lowercase().as_ref() {
-            "tex" | "sty" | "cls" => Some(Language::Latex),
-            "bib" => Some(Language::Bibtex),
-            _ => None,
-        }
-    }
-
-    pub fn by_language_id(language_id: &str) -> Option<Self> {
-        match language_id {
-            "latex" => Some(Language::Latex),
-            "bibtex" => Some(Language::Bibtex),
-            _ => None,
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-pub enum SyntaxTree {
-    Latex(LatexSyntaxTree),
-    Bibtex(BibtexSyntaxTree),
-}
-
-impl SyntaxTree {
-    pub fn parse(text: &str, language: Language) -> Self {
-        match language {
-            Language::Latex => SyntaxTree::Latex(LatexSyntaxTree::from(text)),
-            Language::Bibtex => SyntaxTree::Bibtex(BibtexSyntaxTree::from(text)),
-        }
-    }
-}
-
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub struct Document {
     pub uri: Uri,