Move completion database to data module

latex-lsp · May 19, 2019 · e5e1644 · e5e1644
1 parent a0cc325
commit e5e1644
Show file tree

Hide file tree

Showing 41 changed files with 41 additions and 136 deletions.
diff --git a/src/completion/bibtex/entry_type.rs b/src/completion/bibtex/entry_type.rs
@@ -46,7 +46,7 @@ impl BibtexEntryTypeCompletionProvider {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::Position;

diff --git a/src/completion/bibtex/field_name.rs b/src/completion/bibtex/field_name.rs
@@ -47,7 +47,7 @@ impl BibtexFieldNameCompletionProvider {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::Position;

diff --git a/src/completion/bibtex/kernel_command.rs b/src/completion/bibtex/kernel_command.rs
@@ -37,7 +37,7 @@ impl BibtexKernelCommandCompletionProvider {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::Position;

diff --git a/src/completion/latex/argument_symbol.rs b/src/completion/latex/argument_symbol.rs
@@ -35,7 +35,7 @@ impl LatexArgumentSymbolCompletionProvider {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::Position;

diff --git a/src/completion/latex/citation.rs b/src/completion/latex/citation.rs
@@ -36,7 +36,7 @@ impl LatexCitationCompletionProvider {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::Position;

diff --git a/src/completion/latex/color.rs b/src/completion/latex/color.rs
@@ -124,7 +124,7 @@ const COLOR_NAMES: &'static [&'static str] = &[
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::Position;

diff --git a/src/completion/latex/color_model.rs b/src/completion/latex/color_model.rs
@@ -51,7 +51,7 @@ const MODEL_NAMES: &'static [&'static str] = &["gray", "rgb", "RGB", "HTML", "cm
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::Position;

diff --git a/src/completion/latex/data/actor.rs b/src/completion/latex/data/actor.rs
diff --git a/src/completion/latex/data/mod.rs b/src/completion/latex/data/mod.rs
diff --git a/src/completion/latex/kernel_command.rs b/src/completion/latex/kernel_command.rs
@@ -22,7 +22,7 @@ impl LatexKernelCommandCompletionProvider {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::Position;

diff --git a/src/completion/latex/kernel_environment.rs b/src/completion/latex/kernel_environment.rs
@@ -24,7 +24,7 @@ impl LatexKernelEnvironmentCompletionProvider {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::Position;

diff --git a/src/completion/latex/label.rs b/src/completion/latex/label.rs
@@ -18,8 +18,7 @@ impl LatexLabelCompletionProvider {
                 let mut items = Vec::new();
                 for document in &request.related_documents {
                     if let SyntaxTree::Latex(tree) = &document.tree {
-                        tree
-                            .labels
+                        tree.labels
                             .iter()
                             .filter(|label| label.kind() == LatexLabelKind::Definition)
                             .map(|label| Cow::from(label.name().text().to_owned()))
@@ -36,7 +35,7 @@ impl LatexLabelCompletionProvider {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::Position;

diff --git a/src/completion/latex/mod.rs b/src/completion/latex/mod.rs
@@ -5,7 +5,6 @@ pub mod color;
 pub mod color_model;
 mod combinators;
 pub mod command_symbol;
-pub mod data;
 pub mod include;
 pub mod kernel_command;
 pub mod kernel_environment;

diff --git a/src/completion/latex/pgf_library.rs b/src/completion/latex/pgf_library.rs
@@ -70,7 +70,7 @@ const LIBRARIES: &'static [&'static str] = &[
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::Position;

diff --git a/src/completion/latex/tikz_library.rs b/src/completion/latex/tikz_library.rs
@@ -100,7 +100,7 @@ const LIBRARIES: &'static [&'static str] = &[
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::Position;

diff --git a/src/completion/latex/user_command.rs b/src/completion/latex/user_command.rs
@@ -18,8 +18,7 @@ impl LatexUserCommandCompletionProvider {
                 let mut items = Vec::new();
                 for document in &request.related_documents {
                     if let SyntaxTree::Latex(tree) = &document.tree {
-                        tree
-                            .commands
+                        tree.commands
                             .iter()
                             .filter(|command| command.range() != current_command.range())
                             .map(|command| &command.name.text()[1..])
@@ -42,7 +41,7 @@ impl LatexUserCommandCompletionProvider {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::Position;

diff --git a/src/completion/mod.rs b/src/completion/mod.rs
@@ -1,6 +1,6 @@
 mod bibtex;
 mod factory;
-pub mod latex;
+mod latex;
 mod quality;
 
 use self::bibtex::entry_type::BibtexEntryTypeCompletionProvider;

diff --git a/src/data/bibtex_entry_type.rs b/src/data/bibtex_entry_type.rs
@@ -7,7 +7,7 @@ pub struct BibtexEntryType {
     pub documentation: Option<String>,
 }
 
-const JSON: &'static str = include_str!("bibtex_entry_type.json");
+static JSON: &'static str = include_str!("bibtex_entry_type.json");
 
 lazy_static! {
     pub static ref BIBTEX_ENTRY_TYPES: Vec<BibtexEntryType> = serde_json::from_str(JSON).unwrap();

diff --git a/src/data/bibtex_field.rs b/src/data/bibtex_field.rs
@@ -7,7 +7,7 @@ pub struct BibtexField {
     pub documentation: String,
 }
 
-const JSON: &'static str = include_str!("bibtex_field.json");
+static JSON: &'static str = include_str!("bibtex_field.json");
 
 lazy_static! {
     pub static ref BIBTEX_FIELDS: Vec<BibtexField> = serde_json::from_str(JSON).unwrap();

diff --git a/src/completion/latex/data/types.rs → src/data/completion.rs b/src/completion/latex/data/types.rs → src/data/completion.rs
@@ -4,7 +4,7 @@ use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 
-#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct LatexComponent {
     pub files: Vec<String>,
@@ -13,7 +13,7 @@ pub struct LatexComponent {
     pub environments: Vec<String>,
 }
 
-#[derive(Debug, PartialEq, Eq, Clone, Default, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct LatexComponentDatabase {
     pub components: Vec<Arc<LatexComponent>>,

diff --git a/src/data/component_doc.rs → src/data/component.rs b/src/data/component_doc.rs → src/data/component.rs
diff --git a/src/data/mod.rs b/src/data/mod.rs
@@ -1,4 +1,5 @@
 pub mod bibtex_entry_type;
 pub mod bibtex_field;
-pub mod component_doc;
+pub mod completion;
+pub mod component;
 pub mod symbols;
diff --git a/src/data/symbols.rs b/src/data/symbols.rs
@@ -28,7 +28,7 @@ pub struct LatexArgumentSymbol {
     pub image: String,
 }
 
-const JSON: &'static str = include_str!("symbols.json");
+static JSON: &'static str = include_str!("symbols.json");
 
 lazy_static! {
     pub static ref DATABASE: LatexSymbolDatabase = serde_json::from_str(JSON).unwrap();

diff --git a/src/definition/latex_citation.rs b/src/definition/latex_citation.rs
@@ -50,7 +50,7 @@ impl LatexCitationDefinitionProvider {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::{Position, Range};

diff --git a/src/definition/latex_label.rs b/src/definition/latex_label.rs
@@ -46,7 +46,7 @@ impl LatexLabelDefinitionProvider {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::{Position, Range};

diff --git a/src/feature.rs b/src/feature.rs
@@ -1,4 +1,4 @@
-use crate::completion::latex::data::types::LatexComponentDatabase;
+use crate::data::completion::LatexComponentDatabase;
 #[cfg(test)]
 use crate::workspace::WorkspaceBuilder;
 use crate::workspace::{Document, Workspace};

diff --git a/src/folding/bibtex_declaration.rs b/src/folding/bibtex_declaration.rs
@@ -43,7 +43,7 @@ impl BibtexDeclarationFoldingProvider {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::Position;

diff --git a/src/folding/latex_environment.rs b/src/folding/latex_environment.rs
@@ -28,7 +28,7 @@ impl LatexEnvironmentFoldingProvider {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::Position;

diff --git a/src/folding/latex_section.rs b/src/folding/latex_section.rs
@@ -41,7 +41,7 @@ impl LatexSectionFoldingProvider {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::Position;

diff --git a/src/highlight/latex_label.rs b/src/highlight/latex_label.rs
@@ -38,7 +38,7 @@ impl LatexLabelHighlightProvider {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::{Position, Range};

diff --git a/src/hover/bibtex_entry_type.rs b/src/hover/bibtex_entry_type.rs
@@ -35,7 +35,7 @@ impl BibtexEntryTypeHoverProvider {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::Position;

diff --git a/src/hover/bibtex_field.rs b/src/hover/bibtex_field.rs
@@ -32,7 +32,7 @@ impl BibtexFieldHoverProvider {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::Position;

diff --git a/src/hover/latex_component.rs b/src/hover/latex_component.rs
@@ -1,4 +1,4 @@
-use crate::data::component_doc::ComponentDocumentation;
+use crate::data::component::ComponentDocumentation;
 use crate::feature::FeatureRequest;
 use crate::syntax::latex::{LatexIncludeKind, LatexVisitor};
 use crate::syntax::SyntaxTree;

diff --git a/src/link/latex_include.rs b/src/link/latex_include.rs
@@ -35,7 +35,7 @@ impl LatexIncludeLinkProvider {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::completion::latex::data::types::LatexComponentDatabase;
+    use crate::data::completion::LatexComponentDatabase;
     use crate::feature::FeatureSpec;
     use crate::test_feature;
     use lsp_types::{Position, Range};