From 563a175fdb9073a548fc2e161d5de0a093b0d74d Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Wed, 20 Jan 2021 15:25:34 +0100 Subject: Move SymbolKind to ide_db --- crates/ide/src/syntax_highlighting/format.rs | 3 ++- crates/ide/src/syntax_highlighting/highlight.rs | 4 ++-- crates/ide/src/syntax_highlighting/tags.rs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'crates/ide/src/syntax_highlighting') diff --git a/crates/ide/src/syntax_highlighting/format.rs b/crates/ide/src/syntax_highlighting/format.rs index a74ca844b..63bff6376 100644 --- a/crates/ide/src/syntax_highlighting/format.rs +++ b/crates/ide/src/syntax_highlighting/format.rs @@ -1,10 +1,11 @@ //! Syntax highlighting for format macro strings. +use ide_db::SymbolKind; use syntax::{ ast::{self, FormatSpecifier, HasFormatSpecifier}, AstNode, AstToken, TextRange, }; -use crate::{syntax_highlighting::highlights::Highlights, HlRange, HlTag, SymbolKind}; +use crate::{syntax_highlighting::highlights::Highlights, HlRange, HlTag}; pub(super) fn highlight_format_string( stack: &mut Highlights, diff --git a/crates/ide/src/syntax_highlighting/highlight.rs b/crates/ide/src/syntax_highlighting/highlight.rs index 8625ef5df..24fcbb584 100644 --- a/crates/ide/src/syntax_highlighting/highlight.rs +++ b/crates/ide/src/syntax_highlighting/highlight.rs @@ -3,7 +3,7 @@ use hir::{AsAssocItem, Semantics, VariantDef}; use ide_db::{ defs::{Definition, NameClass, NameRefClass}, - RootDatabase, + RootDatabase, SymbolKind, }; use rustc_hash::FxHashMap; use syntax::{ @@ -12,7 +12,7 @@ use syntax::{ SyntaxNode, SyntaxToken, T, }; -use crate::{syntax_highlighting::tags::HlPunct, Highlight, HlMod, HlTag, SymbolKind}; +use crate::{syntax_highlighting::tags::HlPunct, Highlight, HlMod, HlTag}; pub(super) fn element( sema: &Semantics, diff --git a/crates/ide/src/syntax_highlighting/tags.rs b/crates/ide/src/syntax_highlighting/tags.rs index 8dd05ac52..3c02fdb11 100644 --- a/crates/ide/src/syntax_highlighting/tags.rs +++ b/crates/ide/src/syntax_highlighting/tags.rs @@ -3,7 +3,7 @@ use std::{fmt, ops}; -use crate::SymbolKind; +use ide_db::SymbolKind; #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] pub struct Highlight { -- cgit v1.2.3