azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: reformat

Browse Source
This commit is contained in:
Natalia Selezneva
2018-03-02 10:30:22 +03:00
parent 042873fa2c
commit 9f02664351
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ScriptExternalHighlightingPass.kt
+19 -14
View File
@@ -37,8 +37,8 @@ import org.jetbrains.kotlin.psi.KtFile
import kotlin.script.experimental.dependencies.ScriptReport import kotlin.script.experimental.dependencies.ScriptReport
class ScriptExternalHighlightingPass( class ScriptExternalHighlightingPass(
private val file: KtFile, private val file: KtFile,
document: Document document: Document
) : TextEditorHighlightingPass(file.project, document), DumbAware { ) : TextEditorHighlightingPass(file.project, document), DumbAware {
override fun doCollectInformation(progress: ProgressIndicator) = Unit override fun doCollectInformation(progress: ProgressIndicator) = Unit
@@ -50,11 +50,11 @@ class ScriptExternalHighlightingPass(
val annotations = reports.mapNotNull { (message, severity, position) -> val annotations = reports.mapNotNull { (message, severity, position) ->
val (startOffset, endOffset) = computeOffsets(document, position) ?: return@mapNotNull null val (startOffset, endOffset) = computeOffsets(document, position) ?: return@mapNotNull null
Annotation( Annotation(
startOffset, startOffset,
endOffset, endOffset,
severity.convertSeverity() ?: return@mapNotNull null, severity.convertSeverity() ?: return@mapNotNull null,
message, message,
message message
) )
} }
@@ -74,8 +74,8 @@ class ScriptExternalHighlightingPass(
val endLine = position.endLine?.coerceAtLeast(startLine)?.coerceLineIn(document) ?: startLine val endLine = position.endLine?.coerceAtLeast(startLine)?.coerceLineIn(document) ?: startLine
val endOffset = document.offsetBy( val endOffset = document.offsetBy(
endLine, endLine,
position.endColumn ?: document.getLineEndOffset(endLine) position.endColumn ?: document.getLineEndOffset(endLine)
).coerceAtLeast(startOffset) ).coerceAtLeast(startOffset)
// TODO: presentation when range is empty? // TODO: presentation when range is empty?
@@ -85,8 +85,7 @@ class ScriptExternalHighlightingPass(
private fun Int.coerceLineIn(document: Document) = coerceIn(0, document.lineCount - 1) private fun Int.coerceLineIn(document: Document) = coerceIn(0, document.lineCount - 1)
private fun Document.offsetBy(line: Int, col: Int): Int { private fun Document.offsetBy(line: Int, col: Int): Int {
return (getLineStartOffset(line) + col). return (getLineStartOffset(line) + col).coerceIn(getLineStartOffset(line), getLineEndOffset(line))
coerceIn(getLineStartOffset(line), getLineEndOffset(line))
} }
private fun ScriptReport.Severity.convertSeverity(): HighlightSeverity? { private fun ScriptReport.Severity.convertSeverity(): HighlightSeverity? {
@@ -98,10 +97,16 @@ class ScriptExternalHighlightingPass(
} }
} }
class Factory(project: Project, registrar: TextEditorHighlightingPassRegistrar) class Factory(project: Project, registrar: TextEditorHighlightingPassRegistrar) : AbstractProjectComponent(project),
: AbstractProjectComponent(project), TextEditorHighlightingPassFactory { TextEditorHighlightingPassFactory {
init { init {
registrar.registerTextEditorHighlightingPass(this, TextEditorHighlightingPassRegistrar.Anchor.BEFORE, Pass.UPDATE_FOLDING, false, false) registrar.registerTextEditorHighlightingPass(
this,
TextEditorHighlightingPassRegistrar.Anchor.BEFORE,
Pass.UPDATE_FOLDING,
false,
false
)
} }
override fun createHighlightingPass(file: PsiFile, editor: Editor): TextEditorHighlightingPass? { override fun createHighlightingPass(file: PsiFile, editor: Editor): TextEditorHighlightingPass? {