Compiling again

Conrad Irwin created 2 months ago

Change summary

crates/editor/src/editor_tests.rs        |  8 ++++----
crates/editor/src/element.rs             |  4 ++--
crates/language/src/language_settings.rs | 10 +++++-----
3 files changed, 11 insertions(+), 11 deletions(-)

Detailed changes

crates/editor/src/editor_tests.rs

@@ -22,15 +22,15 @@ use indoc::indoc;
 use language::{
     BracketPairConfig,
     Capability::ReadWrite,
-    DiagnosticSourceKind, FakeLspAdapter, LanguageConfig, LanguageConfigOverride, LanguageMatcher,
-    LanguageName, Override, Point,
+    DiagnosticSourceKind, FakeLspAdapter, IndentGuideSettings, LanguageConfig,
+    LanguageConfigOverride, LanguageMatcher, LanguageName, Override, Point,
     language_settings::{
         CompletionSettingsContent, FormatterList, LanguageSettingsContent, LspInsertMode,
         SelectedFormatter,
     },
     tree_sitter_python,
 };
-use language_settings::{Formatter, IndentGuideSettingsContent};
+use language_settings::Formatter;
 use lsp::CompletionParams;
 use multi_buffer::{IndentGuide, PathKey};
 use parking_lot::Mutex;
@@ -19961,7 +19961,7 @@ fn indent_guide(buffer_id: BufferId, start_row: u32, end_row: u32, depth: u32) -
         end_row: MultiBufferRow(end_row),
         depth,
         tab_size: 4,
-        settings: IndentGuideSettingsContent {
+        settings: IndentGuideSettings {
             enabled: true,
             line_width: 1,
             active_line_width: 1,

crates/editor/src/element.rs

@@ -51,7 +51,7 @@ use gpui::{
     transparent_black,
 };
 use itertools::Itertools;
-use language::language_settings::{IndentGuideSettingsContent, ShowWhitespaceSetting};
+use language::{IndentGuideSettings, language_settings::ShowWhitespaceSetting};
 use markdown::Markdown;
 use multi_buffer::{
     Anchor, ExcerptId, ExcerptInfo, ExpandExcerptDirection, ExpandInfo, MultiBufferPoint,
@@ -10177,7 +10177,7 @@ pub struct IndentGuideLayout {
     single_indent_width: Pixels,
     depth: u32,
     active: bool,
-    settings: IndentGuideSettingsContent,
+    settings: IndentGuideSettings,
 }
 
 pub struct CursorLayout {

crates/language/src/language_settings.rs

@@ -13,13 +13,13 @@ use schemars::json_schema;
 
 pub use settings::{
     CompletionSettingsContent, EditPredictionProvider, EditPredictionsMode, FormatOnSave,
-    Formatter, FormatterList, IndentGuideSettingsContent, InlayHintKind, LanguageSettingsContent,
-    LspInsertMode, RewrapBehavior, SelectedFormatter, ShowWhitespaceSetting, SoftWrap,
-    WordsCompletionMode,
+    Formatter, FormatterList, InlayHintKind, LspInsertMode, RewrapBehavior, SelectedFormatter,
+    ShowWhitespaceSetting, SoftWrap, WordsCompletionMode,
 };
 use settings::{
-    LanguageTaskSettingsContent, ParameterizedJsonSchema, PrettierSettingsContent, Settings,
-    SettingsContent, SettingsLocation, SettingsStore, SettingsUi,
+    IndentGuideSettingsContent, LanguageSettingsContent, LanguageTaskSettingsContent,
+    ParameterizedJsonSchema, PrettierSettingsContent, Settings, SettingsContent, SettingsLocation,
+    SettingsStore, SettingsUi,
 };
 use shellexpand;
 use std::{borrow::Cow, num::NonZeroU32, path::Path, sync::Arc};