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

Better presentation

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-04-18 23:00:29 +03:00
parent 022075995b
commit bade304bf3
15 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt
+1 -1
View File
@@ -114,7 +114,7 @@ object KeywordCompletion {
val constructText = KEYWORD_CONSTRUCTS[keywordToken]
if (constructText != null) {
val element = createKeywordConstructLookupElement(position.project, keyword, constructText, showConstructInLookup = false)
val element = createKeywordConstructLookupElement(position.project, keyword, constructText)
consumer(element)
}
else {
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/handlerUtils.kt
+7 -7
View File
@@ -74,8 +74,7 @@ fun createKeywordConstructLookupElement(
project: Project,
keyword: String,
fileTextToReformat: String,
trimSpacesAroundCaret: Boolean = false,
showConstructInLookup: Boolean = true
trimSpacesAroundCaret: Boolean = false
): LookupElement {
val file = KtPsiFactory(project).createFile(fileTextToReformat)
CodeStyleManager.getInstance(project).reformat(file)
@@ -103,8 +102,13 @@ fun createKeywordConstructLookupElement(
tailBeforeCaret = tailBeforeCaret.unindent(indent)
tailAfterCaret = tailAfterCaret.unindent(indent)
var lookupElementBuilder = LookupElementBuilder.create(KeywordLookupObject(), keyword)
val tailText = (if (tailBeforeCaret.contains('\n')) tailBeforeCaret.replace("\n", "").trimEnd() else tailBeforeCaret) +
"..." +
(if (tailAfterCaret.contains('\n')) tailAfterCaret.replace("\n", "").trimStart() else tailAfterCaret)
return LookupElementBuilder.create(KeywordLookupObject(), keyword)
.bold()
.withTailText(tailText)
.withInsertHandler { insertionContext, lookupElement ->
if (insertionContext.completionChar == Lookup.NORMAL_SELECT_CHAR || insertionContext.completionChar == Lookup.REPLACE_SELECT_CHAR) {
val offset = insertionContext.tailOffset
@@ -117,10 +121,6 @@ fun createKeywordConstructLookupElement(
insertionContext.editor.moveCaret(offset + beforeCaret.length)
}
}
if (showConstructInLookup) {
lookupElementBuilder = lookupElementBuilder.withTailText(tailBeforeCaret + tailAfterCaret)
}
return lookupElementBuilder
}
private fun detectIndent(text: CharSequence, offset: Int): String {
idea/idea-completion/testData/handlers/keywords/Getter1.kt
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@ val v: Int
g<caret>
// ELEMENT: "get"
// TAIL_TEXT: "() = "
// TAIL_TEXT: "() = ..."
idea/idea-completion/testData/handlers/keywords/Getter1.kt.after
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@ val v: Int
get() = <caret>
// ELEMENT: "get"
// TAIL_TEXT: "() = "
// TAIL_TEXT: "() = ..."
idea/idea-completion/testData/handlers/keywords/Getter2.kt
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@ val v: Int
g<caret>
// ELEMENT: "get"
// TAIL_TEXT: "() {}"
// TAIL_TEXT: "() {...}"
idea/idea-completion/testData/handlers/keywords/Getter2.kt.after
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@ val v: Int
get() {<caret>}
// ELEMENT: "get"
// TAIL_TEXT: "() {}"
// TAIL_TEXT: "() {...}"
idea/idea-completion/testData/handlers/keywords/Setter1.kt
Vendored
+1 -1
View File
@@ -3,4 +3,4 @@ var v: Int
s<caret>
// ELEMENT: "set"
// TAIL_TEXT: "(value) = "
// TAIL_TEXT: "(value) = ..."
idea/idea-completion/testData/handlers/keywords/Setter1.kt.after
Vendored
+1 -1
View File
@@ -3,4 +3,4 @@ var v: Int
set(value) = <caret>
// ELEMENT: "set"
// TAIL_TEXT: "(value) = "
// TAIL_TEXT: "(value) = ..."
idea/idea-completion/testData/handlers/keywords/Setter2.kt
Vendored
+1 -1
View File
@@ -3,4 +3,4 @@ var v: Int
s<caret>
// ELEMENT: "set"
// TAIL_TEXT: "(value) {}"
// TAIL_TEXT: "(value) {...}"
idea/idea-completion/testData/handlers/keywords/Setter2.kt.after
Vendored
+1 -1
View File
@@ -3,4 +3,4 @@ var v: Int
set(value) {<caret>}
// ELEMENT: "set"
// TAIL_TEXT: "(value) {}"
// TAIL_TEXT: "(value) {...}"
idea/idea-completion/testData/keywords/AfterClassProperty.kt
Vendored
+4 -4
View File
@@ -11,8 +11,8 @@ class MouseMovedEventArgs
// EXIST: final
// EXIST: fun
// EXIST: { itemText: "get", tailText: null }
// EXIST: { itemText: "get", tailText: "() = " }
// EXIST: { itemText: "get", tailText: "() {}" }
// EXIST: { itemText: "get", tailText: "() = ..." }
// EXIST: { itemText: "get", tailText: "() {...}" }
// EXIST: inner
// EXIST: internal
// EXIST: object
@@ -22,8 +22,8 @@ class MouseMovedEventArgs
// EXIST: protected
// EXIST: public
// EXIST: { itemText: "set", tailText: null }
// EXIST: { itemText: "set", tailText: "(value) = " }
// EXIST: { itemText: "set", tailText: "(value) {}" }
// EXIST: { itemText: "set", tailText: "(value) = ..." }
// EXIST: { itemText: "set", tailText: "(value) {...}" }
// EXIST: interface
// EXIST: val
// EXIST: var
idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt
Vendored
+4 -4
View File
@@ -16,16 +16,16 @@ var a : Int
// EXIST: final
// EXIST: fun
// EXIST: { itemText: "get", tailText: null }
// EXIST: { itemText: "get", tailText: "() = " }
// EXIST: { itemText: "get", tailText: "() {}" }
// EXIST: { itemText: "get", tailText: "() = ..." }
// EXIST: { itemText: "get", tailText: "() {...}" }
// EXIST: internal
// EXIST: object
// EXIST: open
// EXIST: private
// EXIST: public
// EXIST: { itemText: "set", tailText: null }
// EXIST: { itemText: "set", tailText: "(value) = " }
// EXIST: { itemText: "set", tailText: "(value) {}" }
// EXIST: { itemText: "set", tailText: "(value) = ..." }
// EXIST: { itemText: "set", tailText: "(value) {...}" }
// EXIST: interface
// EXIST: val
// EXIST: var
idea/idea-completion/testData/keywords/PropertyAccessors.kt
Vendored
+4 -4
View File
@@ -10,8 +10,8 @@ class Some {
// EXIST: final
// EXIST: fun
// EXIST: { itemText: "get", tailText: null }
// EXIST: { itemText: "get", tailText: "() = " }
// EXIST: { itemText: "get", tailText: "() {}" }
// EXIST: { itemText: "get", tailText: "() = ..." }
// EXIST: { itemText: "get", tailText: "() {...}" }
// EXIST: inner
// EXIST: internal
// EXIST: object
@@ -21,8 +21,8 @@ class Some {
// EXIST: protected
// EXIST: public
// EXIST: { itemText: "set", tailText: null }
// EXIST: { itemText: "set", tailText: "(value) = " }
// EXIST: { itemText: "set", tailText: "(value) {}" }
// EXIST: { itemText: "set", tailText: "(value) = ..." }
// EXIST: { itemText: "set", tailText: "(value) {...}" }
// EXIST: interface
// EXIST: val
// EXIST: var
idea/idea-completion/testData/keywords/PropertyAccessors2.kt
Vendored
+4 -4
View File
@@ -10,8 +10,8 @@ class Some {
// EXIST: final
// EXIST: fun
// EXIST: { itemText: "get", tailText: null }
// EXIST: { itemText: "get", tailText: "() = " }
// EXIST: { itemText: "get", tailText: "() {}" }
// EXIST: { itemText: "get", tailText: "() = ..." }
// EXIST: { itemText: "get", tailText: "() {...}" }
// EXIST: inner
// EXIST: internal
// EXIST: object
@@ -21,8 +21,8 @@ class Some {
// EXIST: protected
// EXIST: public
// EXIST: { itemText: "set", tailText: null }
// EXIST: { itemText: "set", tailText: "(value) = " }
// EXIST: { itemText: "set", tailText: "(value) {}" }
// EXIST: { itemText: "set", tailText: "(value) = ..." }
// EXIST: { itemText: "set", tailText: "(value) {...}" }
// EXIST: interface
// EXIST: val
// EXIST: var
idea/idea-completion/testData/keywords/PropertySetter.kt
Vendored
+2 -2
View File
@@ -19,8 +19,8 @@ class Some {
// EXIST: protected
// EXIST: public
// EXIST: { itemText: "set", tailText: null }
// EXIST: { itemText: "set", tailText: "(value) = " }
// EXIST: { itemText: "set", tailText: "(value) {}" }
// EXIST: { itemText: "set", tailText: "(value) = ..." }
// EXIST: { itemText: "set", tailText: "(value) {...}" }
// EXIST: interface
// EXIST: val
// EXIST: var