Add support for closing and deleting raw strings (KT-2582)
#KT-2582 Fixed
This commit is contained in:
committed by
Nikolay Krasko
parent
5216dfcc59
commit
8252b35ed5
@@ -586,6 +586,7 @@
|
|||||||
|
|
||||||
<typedHandler implementation="org.jetbrains.kotlin.idea.editor.KotlinTypedHandler"/>
|
<typedHandler implementation="org.jetbrains.kotlin.idea.editor.KotlinTypedHandler"/>
|
||||||
<typedHandler implementation="org.jetbrains.kotlin.idea.kdoc.KDocTypedHandler"/>
|
<typedHandler implementation="org.jetbrains.kotlin.idea.kdoc.KDocTypedHandler"/>
|
||||||
|
<typedHandler implementation="org.jetbrains.kotlin.idea.editor.KotlinRawStringTypedHandler"/>
|
||||||
<enterHandlerDelegate implementation="org.jetbrains.kotlin.idea.editor.KotlinEnterHandler"
|
<enterHandlerDelegate implementation="org.jetbrains.kotlin.idea.editor.KotlinEnterHandler"
|
||||||
id="KotlinEnterHandler" order="before EnterBetweenBracesHandler"/>
|
id="KotlinEnterHandler" order="before EnterBetweenBracesHandler"/>
|
||||||
<enterHandlerDelegate implementation="org.jetbrains.kotlin.idea.editor.KotlinMultilineStringEnterHandler"
|
<enterHandlerDelegate implementation="org.jetbrains.kotlin.idea.editor.KotlinMultilineStringEnterHandler"
|
||||||
@@ -593,6 +594,7 @@
|
|||||||
<lang.smartEnterProcessor language="kotlin" implementationClass="org.jetbrains.kotlin.idea.editor.KotlinSmartEnterHandler"/>
|
<lang.smartEnterProcessor language="kotlin" implementationClass="org.jetbrains.kotlin.idea.editor.KotlinSmartEnterHandler"/>
|
||||||
<backspaceHandlerDelegate implementation="org.jetbrains.kotlin.idea.editor.KotlinBackspaceHandler"/>
|
<backspaceHandlerDelegate implementation="org.jetbrains.kotlin.idea.editor.KotlinBackspaceHandler"/>
|
||||||
<backspaceHandlerDelegate implementation="org.jetbrains.kotlin.idea.editor.KotlinStringTemplateBackspaceHandler"/>
|
<backspaceHandlerDelegate implementation="org.jetbrains.kotlin.idea.editor.KotlinStringTemplateBackspaceHandler"/>
|
||||||
|
<backspaceHandlerDelegate implementation="org.jetbrains.kotlin.idea.editor.KotlinRawStringBackspaceHandler"/>
|
||||||
|
|
||||||
<copyPastePostProcessor implementation="org.jetbrains.kotlin.idea.conversion.copy.ConvertJavaCopyPasteProcessor"/>
|
<copyPastePostProcessor implementation="org.jetbrains.kotlin.idea.conversion.copy.ConvertJavaCopyPasteProcessor"/>
|
||||||
<copyPastePostProcessor implementation="org.jetbrains.kotlin.idea.conversion.copy.ConvertTextJavaCopyPasteProcessor"/>
|
<copyPastePostProcessor implementation="org.jetbrains.kotlin.idea.conversion.copy.ConvertTextJavaCopyPasteProcessor"/>
|
||||||
|
|||||||
@@ -0,0 +1,59 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2010-2017 JetBrains s.r.o.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.jetbrains.kotlin.idea.editor
|
||||||
|
|
||||||
|
import com.intellij.codeInsight.CodeInsightSettings
|
||||||
|
import com.intellij.codeInsight.editorActions.BackspaceHandlerDelegate
|
||||||
|
import com.intellij.openapi.editor.Editor
|
||||||
|
import com.intellij.openapi.editor.RangeMarker
|
||||||
|
import com.intellij.psi.PsiFile
|
||||||
|
import com.intellij.psi.util.parentOfType
|
||||||
|
import org.jetbrains.kotlin.psi.KtFile
|
||||||
|
import org.jetbrains.kotlin.psi.KtStringTemplateExpression
|
||||||
|
|
||||||
|
class KotlinRawStringBackspaceHandler : BackspaceHandlerDelegate() {
|
||||||
|
private var rangeMarker: RangeMarker? = null
|
||||||
|
|
||||||
|
override fun beforeCharDeleted(c: Char, file: PsiFile, editor: Editor) {
|
||||||
|
rangeMarker = null
|
||||||
|
if (!CodeInsightSettings.getInstance().AUTOINSERT_PAIR_QUOTE) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (file !is KtFile) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
val offset = editor.caretModel.offset
|
||||||
|
val psiElement = file.findElementAt(offset) ?: return
|
||||||
|
|
||||||
|
psiElement.parentOfType(KtStringTemplateExpression::class)?.let {
|
||||||
|
if (it.text == "\"\"\"\"\"\"") {
|
||||||
|
if (editor.caretModel.offset == it.textOffset + 3) {
|
||||||
|
rangeMarker = editor.document.createRangeMarker(it.textRange)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun charDeleted(c: Char, file: PsiFile, editor: Editor): Boolean {
|
||||||
|
rangeMarker?.let {
|
||||||
|
editor.document.deleteString(it.startOffset, it.endOffset)
|
||||||
|
rangeMarker = null
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2010-2017 JetBrains s.r.o.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.jetbrains.kotlin.idea.editor
|
||||||
|
|
||||||
|
import com.intellij.codeInsight.CodeInsightSettings
|
||||||
|
import com.intellij.codeInsight.editorActions.TypedHandlerDelegate
|
||||||
|
import com.intellij.openapi.editor.Editor
|
||||||
|
import com.intellij.openapi.fileTypes.FileType
|
||||||
|
import com.intellij.openapi.project.Project
|
||||||
|
import com.intellij.psi.PsiFile
|
||||||
|
import com.intellij.psi.util.PsiTreeUtil
|
||||||
|
import org.jetbrains.kotlin.psi.KtFile
|
||||||
|
import org.jetbrains.kotlin.psi.KtStringTemplateExpression
|
||||||
|
|
||||||
|
class KotlinRawStringTypedHandler : TypedHandlerDelegate() {
|
||||||
|
override fun beforeCharTyped(c: Char, project: Project, editor: Editor, file: PsiFile, fileType: FileType): Result {
|
||||||
|
if (!CodeInsightSettings.getInstance().AUTOINSERT_PAIR_QUOTE) {
|
||||||
|
return Result.CONTINUE
|
||||||
|
}
|
||||||
|
if (file !is KtFile) {
|
||||||
|
return Result.CONTINUE
|
||||||
|
}
|
||||||
|
if (c != '"') {
|
||||||
|
return Result.CONTINUE
|
||||||
|
}
|
||||||
|
// A quote is typed after 2 other quotes
|
||||||
|
val offset = editor.caretModel.offset
|
||||||
|
// Check for caret at end of document
|
||||||
|
if (offset < editor.document.textLength) {
|
||||||
|
val psiElement = file.findElementAt(offset) ?: return Result.CONTINUE
|
||||||
|
if (PsiTreeUtil.getParentOfType(psiElement, KtStringTemplateExpression::class.java) != null) {
|
||||||
|
return Result.CONTINUE
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val text = editor.document.text
|
||||||
|
if (offset >= 2)
|
||||||
|
if (text[offset - 1] == '"')
|
||||||
|
if (text[offset - 2] == '"') {
|
||||||
|
editor.document.insertString(offset, "\"\"\"\"")
|
||||||
|
editor.caretModel.currentCaret.moveToOffset(offset + 1)
|
||||||
|
return Result.STOP
|
||||||
|
}
|
||||||
|
|
||||||
|
return Result.CONTINUE
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
"\"\"\"<caret>\"\"\""
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
<caret>
|
||||||
@@ -74,6 +74,12 @@ class TypedHandlerTest : LightCodeInsightTestCase() {
|
|||||||
"""val x = "$dollar{}]" """
|
"""val x = "$dollar{}]" """
|
||||||
)
|
)
|
||||||
|
|
||||||
|
fun testAutoCloseRawString() = doCharTypeTest(
|
||||||
|
'"',
|
||||||
|
"""val x = ""<caret>""",
|
||||||
|
"""val x = ""${'"'}"<caret>""${'"'}"""
|
||||||
|
)
|
||||||
|
|
||||||
fun testAutoCloseBraceInFunctionDeclaration() = doCharTypeTest(
|
fun testAutoCloseBraceInFunctionDeclaration() = doCharTypeTest(
|
||||||
'{',
|
'{',
|
||||||
"fun foo() <caret>",
|
"fun foo() <caret>",
|
||||||
|
|||||||
Reference in New Issue
Block a user