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

Minor: use property access syntax if possible

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-08-19 14:02:47 +03:00
parent d675c12a32
commit bd43dbc7f4
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt
+19 -19
View File
@@ -52,12 +52,12 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() {
if (contextElement == null) { if (contextElement == null) {
LOG.warn("CodeFragment with null context created:\noriginalContext = ${context?.getElementTextWithContext()}") LOG.warn("CodeFragment with null context created:\noriginalContext = ${context?.getElementTextWithContext()}")
} }
val codeFragment = if (item.getKind() == CodeFragmentKind.EXPRESSION) { val codeFragment = if (item.kind == CodeFragmentKind.EXPRESSION) {
JetExpressionCodeFragment( JetExpressionCodeFragment(
project, project,
"fragment.kt", "fragment.kt",
item.getText(), item.text,
item.getImports(), item.imports,
contextElement contextElement
) )
} }
@@ -65,8 +65,8 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() {
JetBlockCodeFragment( JetBlockCodeFragment(
project, project,
"fragment.kt", "fragment.kt",
item.getText(), item.text,
item.getImports(), item.imports,
contextElement contextElement
) )
} }
@@ -74,8 +74,8 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() {
codeFragment.putCopyableUserData(JetCodeFragment.RUNTIME_TYPE_EVALUATOR, { codeFragment.putCopyableUserData(JetCodeFragment.RUNTIME_TYPE_EVALUATOR, {
expression: JetExpression -> expression: JetExpression ->
val debuggerContext = DebuggerManagerEx.getInstanceEx(project).getContext() val debuggerContext = DebuggerManagerEx.getInstanceEx(project).context
val debuggerSession = debuggerContext.getDebuggerSession() val debuggerSession = debuggerContext.debuggerSession
if (debuggerSession == null) { if (debuggerSession == null) {
null null
} }
@@ -83,14 +83,14 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() {
val semaphore = Semaphore() val semaphore = Semaphore()
semaphore.down() semaphore.down()
val nameRef = AtomicReference<JetType>() val nameRef = AtomicReference<JetType>()
val worker = object : KotlinRuntimeTypeEvaluator(null, expression, debuggerContext, ProgressManager.getInstance().getProgressIndicator()) { val worker = object : KotlinRuntimeTypeEvaluator(null, expression, debuggerContext, ProgressManager.getInstance().progressIndicator) {
override fun typeCalculationFinished(type: JetType?) { override fun typeCalculationFinished(type: JetType?) {
nameRef.set(type) nameRef.set(type)
semaphore.up() semaphore.up()
} }
} }
debuggerContext.getDebugProcess()?.getManagerThread()?.invoke(worker) debuggerContext.debugProcess?.managerThread?.invoke(worker)
for (i in 0..50) { for (i in 0..50) {
ProgressManager.checkCanceled() ProgressManager.checkCanceled()
@@ -114,9 +114,9 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() {
override fun isContextAccepted(contextElement: PsiElement?): Boolean { override fun isContextAccepted(contextElement: PsiElement?): Boolean {
if (contextElement is PsiCodeBlock) { if (contextElement is PsiCodeBlock) {
// PsiCodeBlock -> DummyHolder -> originalElement // PsiCodeBlock -> DummyHolder -> originalElement
return isContextAccepted(contextElement.getContext()?.getContext()) return isContextAccepted(contextElement.context?.context)
} }
return contextElement?.getLanguage() == JetFileType.INSTANCE.getLanguage() return contextElement?.language == JetFileType.INSTANCE.language
} }
override fun getFileType() = JetFileType.INSTANCE override fun getFileType() = JetFileType.INSTANCE
@@ -131,17 +131,17 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() {
if (elementAt == null) return null if (elementAt == null) return null
if (elementAt is PsiCodeBlock) { if (elementAt is PsiCodeBlock) {
return getContextElement(elementAt.getContext()?.getContext()) return getContextElement(elementAt.context?.context)
} }
if (elementAt is KotlinLightClass) { if (elementAt is KotlinLightClass) {
return getContextElement(elementAt.getOrigin()) return getContextElement(elementAt.getOrigin())
} }
val containingFile = elementAt.getContainingFile() val containingFile = elementAt.containingFile
if (containingFile !is JetFile) return null if (containingFile !is JetFile) return null
val expressionAtOffset = PsiTreeUtil.findElementOfClassAtOffset(containingFile, elementAt.getTextOffset(), javaClass<JetExpression>(), false) val expressionAtOffset = PsiTreeUtil.findElementOfClassAtOffset(containingFile, elementAt.textOffset, javaClass<JetExpression>(), false)
if (expressionAtOffset != null && KotlinEditorTextProvider.isAcceptedAsCodeFragmentContext(elementAt)) { if (expressionAtOffset != null && KotlinEditorTextProvider.isAcceptedAsCodeFragmentContext(elementAt)) {
return expressionAtOffset return expressionAtOffset
} }
@@ -154,7 +154,7 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() {
val sb = StringBuilder() val sb = StringBuilder()
val labeledObjects = HashMap<String, ObjectReference>() val labeledObjects = HashMap<String, ObjectReference>()
for ((value, markup) in markupMap.entrySet()) { for ((value, markup) in markupMap.entrySet()) {
val labelName = markup.getText() val labelName = markup.text
if (!Name.isValidIdentifier(labelName)) continue if (!Name.isValidIdentifier(labelName)) continue
val objectRef = value as ObjectReference val objectRef = value as ObjectReference
@@ -171,10 +171,10 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() {
} }
private fun wrapContextIfNeeded(project: Project, originalContext: JetElement?): JetElement? { private fun wrapContextIfNeeded(project: Project, originalContext: JetElement?): JetElement? {
val session = XDebuggerManager.getInstance(project).getCurrentSession() as? XDebugSessionImpl val session = XDebuggerManager.getInstance(project).currentSession as? XDebugSessionImpl
?: return originalContext ?: return originalContext
val markupMap = session.getValueMarkers()?.getAllMarkers() val markupMap = session.valueMarkers?.getAllMarkers()
if (markupMap == null || markupMap.isEmpty()) return originalContext if (markupMap == null || markupMap.isEmpty()) return originalContext
val (text, labels) = createCodeFragmentForLabeledObjects(markupMap) val (text, labels) = createCodeFragmentForLabeledObjects(markupMap)
@@ -194,13 +194,13 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() {
codeFragment.accept(object : JetTreeVisitorVoid() { codeFragment.accept(object : JetTreeVisitorVoid() {
override fun visitProperty(property: JetProperty) { override fun visitProperty(property: JetProperty) {
val reference = labels.get(property.getName()) val reference = labels.get(property.name)
if (reference != null) { if (reference != null) {
property.putUserData(LABEL_VARIABLE_VALUE_KEY, reference) property.putUserData(LABEL_VARIABLE_VALUE_KEY, reference)
} }
} }
}) })
return getContextElement(codeFragment.findElementAt(codeFragment.getText().length() - 1)) return getContextElement(codeFragment.findElementAt(codeFragment.text.length() - 1))
} }
} }