Skip to content

Commit 08a54c7

Browse files
shalupovintellij-monorepo-bot
shalupov
authored and
intellij-monorepo-bot
committed
IJI-3282 Optimize imports
GitOrigin-RevId: 3b5c00d8ff20b8d0bb6005bc450921085d2da9b2
1 parent bba550f commit 08a54c7

31 files changed

+143
-48
lines changed

‎rider-fsharp/src/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/FSharpDummyParser.kt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@ import com.intellij.lang.PsiBuilder
55
import com.intellij.lang.PsiParser
66
import com.intellij.psi.tree.IElementType
77
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType
8-
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.*
98
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.impl.FSharpElementTypes
9+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.parse
10+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.parseEvenEmpty
11+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.scanOrRollback
12+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.tryEatAnyToken
13+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.whileMakingProgress
1014

1115
class FSharpDummyParser : PsiParser {
1216
override fun parse(root: IElementType, builder: PsiBuilder): ASTNode {

‎rider-fsharp/src/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/FSharpParserDefinition.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ import com.intellij.psi.util.PsiUtilCore
1212
import com.jetbrains.rd.platform.util.getLogger
1313
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpLexer
1414
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType
15-
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.impl.*
15+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.impl.FSharpElementTypes
16+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.impl.FSharpFileImpl
17+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.impl.FSharpScriptFileImpl
18+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.impl.FSharpSignatureFileImpl
1619

1720
class FSharpParserDefinition : ParserDefinition {
1821
private val logger = getLogger<FSharpParserDefinition>()

‎rider-fsharp/src/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/highlighting/FSharpSyntaxHighlighterFactory.kt‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,15 @@ import com.intellij.openapi.fileTypes.SyntaxHighlighterBase
66
import com.intellij.psi.TokenType
77
import com.intellij.psi.tree.IElementType
88
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpLexer
9-
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType.*
9+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType.BLOCK_COMMENTS
10+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType.BYTECHAR
11+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType.CHARACTER_LITERAL
12+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType.IDENT_KEYWORDS
13+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType.INTERPOLATED_STRINGS
14+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType.LINE_COMMENT
15+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType.NUMBERS
16+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType.PP_KEYWORDS
17+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType.STRINGS
1018

1119
open class FSharpSyntaxHighlighter : SyntaxHighlighterBase() {
1220
companion object {

‎rider-fsharp/src/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/injections/FSharpConcatenationAwareInjector.kt‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@ package com.jetbrains.rider.ideaInterop.fileTypes.fsharp.injections
33
import com.intellij.openapi.util.TextRange
44
import com.intellij.psi.ElementManipulators
55
import com.intellij.psi.PsiElement
6-
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType.*
7-
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.*
6+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType.INTERPOLATED_STRINGS_WITHOUT_INSERTIONS
7+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType.INTERPOLATED_STRING_ENDS
8+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType.INTERPOLATED_STRING_STARTS
9+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.FSharpInterpolatedStringLiteralExpression
10+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.FSharpInterpolatedStringLiteralExpressionPart
11+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.FSharpStringLiteralExpression
12+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.FSharpStringLiteralType
13+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.getDollarsCount
814
import com.jetbrains.rider.languages.fileTypes.clr.psi.ClrLanguageInterpolatedStringLiteralExpression
915
import com.jetbrains.rider.languages.fileTypes.clr.psi.ClrLanguageInterpolatedStringLiteralExpressionPart
1016
import com.jetbrains.rider.languages.fileTypes.clr.psi.ClrLanguageStringLiteralExpression

‎rider-fsharp/src/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/lexer/FSharpLexerInterpolatedStringState.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer
22

3-
import java.util.*
3+
import java.util.Stack
44

55
data class FSharpLexerInterpolatedStringState(
66
public val Kind: FSharpInterpolatedStringKind,

‎rider-fsharp/src/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/psi/impl/FSharpElementTypes.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.impl
22

3-
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.*
3+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.FSharpFileElementType
4+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.createCompositeElementType
45

56
object FSharpElementTypes {
67
val FILE = FSharpFileElementType()

‎rider-fsharp/src/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/psi/impl/FSharpInterpolatedStringLiteralExpressionImpl.kt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ import com.intellij.psi.PsiFileFactory
55
import com.intellij.psi.PsiLanguageInjectionHost
66
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.FSharpFileType
77
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType
8-
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.*
8+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.FSharpElementType
9+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.FSharpFile
10+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.FSharpInterpolatedStringLiteralExpression
11+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.FSharpInterpolatedStringLiteralExpressionPart
12+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.FSharpStringLiteralType
13+
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.createSuitableLiteralTextEscaper
914

1015
class FSharpInterpolatedStringLiteralExpressionImpl(type: FSharpElementType) :
1116
FSharpStringLiteralExpressionBase(type),

‎rider-fsharp/src/main/java/com/jetbrains/rider/plugins/fsharp/editorActions/FSharpEnterHandlerDelegate.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.FSharpLanguage
2525
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType
2626
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType.LINE_COMMENT
2727
import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.FSharpInterpolatedStringLiteralExpression
28-
import com.jetbrains.rider.plugins.fsharp.editorActions.LineIndent.Type.*
28+
import com.jetbrains.rider.plugins.fsharp.editorActions.LineIndent.Type.Comments
29+
import com.jetbrains.rider.plugins.fsharp.editorActions.LineIndent.Type.Source
2930
import java.lang.Character.isWhitespace
3031

3132
private val logger = Logger.getInstance(FSharpEnterHandlerDelegate::class.java)

‎rider-fsharp/src/main/java/com/jetbrains/rider/plugins/fsharp/fileStructure/FSharpExtendedFileStructureSupport.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.jetbrains.rider.plugins.fsharp.fileStructure
22

33
import com.intellij.ide.util.treeView.smartTree.Sorter
4-
import com.jetbrains.rider.fileStructure.*
4+
import com.jetbrains.rider.fileStructure.RiderExtendedFileStructureBase
55

66
class FSharpExtendedFileStructureSupport : RiderExtendedFileStructureBase() {
77
override val sorters: Array<Sorter> get() = emptyArray()

‎rider-fsharp/src/main/java/com/jetbrains/rider/plugins/fsharp/projectView/FSharpMoveProviderExtension.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import com.jetbrains.rider.model.RdProjectModelItemDescriptor
1010
import com.jetbrains.rider.projectView.ProjectElementView
1111
import com.jetbrains.rider.projectView.ProjectEntityView
1212
import com.jetbrains.rider.projectView.moveProviders.extensions.MoveProviderExtension
13-
import com.jetbrains.rider.projectView.nodes.*
13+
import com.jetbrains.rider.projectView.nodes.getUserData
1414
import com.jetbrains.rider.projectView.utils.compareProjectModelEntities
1515
import com.jetbrains.rider.projectView.workspace.ProjectModelEntity
1616
import com.jetbrains.rider.projectView.workspace.containingProjectEntity

0 commit comments

Comments
 (0)