Merge branch 'main' into multi-server-completions-tailwind

2023-08-30 22:58:37 -04:00
parent 529adb95a1 b94955910c
commit ff3865a4ad
427 changed files with 43121 additions and 12859 deletions
@@ -18,7 +18,7 @@ use futures::{
    FutureExt, TryFutureExt as _,
 };
 use gpui::{executor::Background, AppContext, AsyncAppContext, Task};
-use highlight_map::HighlightMap;
+pub use highlight_map::HighlightMap;
 use lazy_static::lazy_static;
 use lsp::{CodeActionKind, LanguageServerBinary};
 use parking_lot::{Mutex, RwLock};
@@ -57,6 +57,7 @@ pub use diagnostic_set::DiagnosticEntry;
 pub use lsp::LanguageServerId;
 pub use outline::{Outline, OutlineItem};
 pub use syntax_map::{OwnedSyntaxLayerInfo, SyntaxLayerInfo};
+pub use text::LineEnding;
 pub use tree_sitter::{Parser, Tree};

 pub fn init(cx: &mut AppContext) {