Skip to content

Commit d0ad7b2

Browse files
committed
fix compatibility verification issues
1 parent 02f8464 commit d0ad7b2

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ data class BuildData(
4242
val buildDataList = listOf(
4343
BuildData(
4444
ideaSDKShortVersion = "243",
45-
ideaSDKVersion = "243-EAP-SNAPSHOT",
45+
ideaSDKVersion = "243.21565.193",
4646
sinceBuild = "232",
4747
untilBuild = "243.*",
4848
bunch = "212",

src/main/java/com/tang/intellij/lua/debugger/LuaDebugProcess.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import com.intellij.xdebugger.breakpoints.XBreakpointHandler
3232
import com.intellij.xdebugger.breakpoints.XBreakpointProperties
3333
import com.intellij.xdebugger.breakpoints.XLineBreakpoint
3434
import com.intellij.xdebugger.frame.XSuspendContext
35-
import com.intellij.xdebugger.impl.XDebugSessionImpl
3635
import com.intellij.xdebugger.impl.actions.XDebuggerActions
3736

3837
/**
@@ -144,11 +143,13 @@ abstract class LuaDebugProcess protected constructor(session: XDebugSession) : X
144143
}
145144
} else {
146145
ApplicationManager.getApplication().invokeLater {
147-
val se = session
146+
// todo: fix "Internal classes usages" & "Internal methods usages" problem
147+
/*val se = session
148148
if (se is XDebugSessionImpl)
149149
se.positionReached(LuaSuspendContext(stack), true)
150150
else
151-
se.positionReached(LuaSuspendContext(stack))
151+
se.positionReached(LuaSuspendContext(stack))*/
152+
session.positionReached(LuaSuspendContext(stack))
152153
session.showExecutionPoint()
153154
}
154155
}

src/main/java/com/tang/intellij/lua/debugger/emmy/EmmyDebugProcessBase.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import com.intellij.xdebugger.XSourcePosition
2626
import com.intellij.xdebugger.breakpoints.XLineBreakpoint
2727
import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider
2828
import com.intellij.xdebugger.frame.XSuspendContext
29-
import com.intellij.xdebugger.impl.XDebugSessionImpl
3029
import com.tang.intellij.lua.debugger.*
3130
import com.tang.intellij.lua.psi.LuaFileManager
3231
import com.tang.intellij.lua.psi.LuaFileUtil
@@ -168,11 +167,13 @@ abstract class EmmyDebugProcessBase(session: XDebugSession) : LuaDebugProcess(se
168167
}
169168
} else {
170169
ApplicationManager.getApplication().invokeLater {
171-
val se = session
170+
// todo: fix "Internal classes usages" & "Internal methods usages" problem
171+
/*val se = session
172172
if (se is XDebugSessionImpl)
173173
se.positionReached(LuaSuspendContext(stack), true)
174174
else
175-
se.positionReached(LuaSuspendContext(stack))
175+
se.positionReached(LuaSuspendContext(stack))*/
176+
session.positionReached(LuaSuspendContext(stack))
176177
session.showExecutionPoint()
177178
}
178179
}

src/main/java/com/tang/intellij/lua/debugger/remote/value/LuaRTable.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package com.tang.intellij.lua.debugger.remote.value
1919
import com.intellij.icons.AllIcons
2020
import com.intellij.xdebugger.evaluation.XDebuggerEvaluator
2121
import com.intellij.xdebugger.frame.*
22-
import com.intellij.xdebugger.impl.XDebugSessionImpl
2322
import com.tang.intellij.lua.debugger.remote.LuaMobDebugProcess
2423
import org.luaj.vm2.LuaValue
2524

@@ -75,11 +74,13 @@ class LuaRTable(name: String) : LuaRValue(name) {
7574

7675
override fun evaluated(tv: XValue) {
7776
//////////tmp solution,非栈顶帧处理
78-
var tableValue = tv
79-
if (data != null && !(process.session as XDebugSessionImpl).isTopFrameSelected)
80-
tableValue = LuaRValue.create(myName, data as LuaValue, myName, process.session)
77+
// todo: fix "Internal classes usages" & "Internal methods usages" problem
78+
//var tableValue = tv
79+
//if (data != null && !(process.session as XDebugSessionImpl).isTopFrameSelected)
80+
// tableValue = LuaRValue.create(myName, data as LuaValue, myName, process.session)
8181
//////////
8282

83+
val tableValue = tv
8384
val list = XValueChildrenList()
8485
val tbl = tableValue as? LuaRTable ?: return
8586
val table = tbl.data?.checktable()

src/main/java/com/tang/intellij/lua/project/LuaLibraryRootsComponentDescriptor.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@ open class LuaLibraryRootsComponentDescriptor : LibraryRootsComponentDescriptor(
3434

3535
override fun createAttachFilesChooserDescriptor(libraryName: String?): FileChooserDescriptor {
3636
return object : FileChooserDescriptor(super.createAttachFilesChooserDescriptor(libraryName)) {
37-
override fun isFileVisible(file: VirtualFile, showHiddenFiles: Boolean): Boolean {
37+
// todo: fix "Non-extendable method usage violation" problem
38+
/*override fun isFileVisible(file: VirtualFile, showHiddenFiles: Boolean): Boolean {
3839
if (file.isDirectory)
3940
return true
4041
4142
val ext = file.extension
4243
return ext != null && ext.equals("zip", ignoreCase = true)
43-
}
44+
}*/
4445
}
4546
}
4647

src/main/java/com/tang/intellij/lua/refactoring/rename/LuaIntroduceVarHandler.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,11 @@ import com.intellij.openapi.command.WriteCommandAction
2222
import com.intellij.openapi.editor.Editor
2323
import com.intellij.openapi.project.Project
2424
import com.intellij.openapi.util.Pass
25-
import com.intellij.psi.PsiDocumentManager
26-
import com.intellij.psi.PsiElement
27-
import com.intellij.psi.PsiFile
28-
import com.intellij.psi.SmartPsiElementPointer
25+
import com.intellij.psi.*
2926
import com.intellij.psi.util.PsiTreeUtil
3027
import com.intellij.refactoring.RefactoringActionHandler
3128
import com.intellij.refactoring.introduce.inplace.InplaceVariableIntroducer
3229
import com.intellij.refactoring.introduce.inplace.OccurrencesChooser
33-
import com.intellij.refactoring.suggested.createSmartPointer
3430
import com.tang.intellij.lua.psi.*
3531
import com.tang.intellij.lua.refactoring.LuaRefactoringUtil
3632

0 commit comments

Comments
 (0)