Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
8b5f2f94
K
kotlin
项目概览
硅谷海盗
/
kotlin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kotlin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8b5f2f94
编写于
6月 11, 2020
作者:
Y
Yan Zhulanow
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix duplicate stepping filter adding on plugin start-up (KT-38628)
Review KT-CR-1301.
上级
235b9b92
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
6 addition
and
11 deletion
+6
-11
idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt
.../jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt
+0
-1
idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/filter/DebuggerFiltersUtil.kt
...brains/kotlin/idea/debugger/filter/DebuggerFiltersUtil.kt
+6
-7
idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/preference/DebuggerPreferenceKey.kt
...in/idea/debugger/test/preference/DebuggerPreferenceKey.kt
+0
-1
idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/preference/SettingsMutators.kt
.../kotlin/idea/debugger/test/preference/SettingsMutators.kt
+0
-2
未找到文件。
idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt
浏览文件 @
8b5f2f94
...
...
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.idea.debugger.stepping.KotlinSteppingConfigurableUi
class
KotlinDebuggerSettings
:
XDebuggerSettings
<
KotlinDebuggerSettings
>(
"kotlin_debugger"
),
Getter
<
KotlinDebuggerSettings
>
{
var
renderDelegatedProperties
:
Boolean
=
false
var
disableKotlinInternalClasses
:
Boolean
=
true
var
isFilterForStdlibAlreadyAdded
:
Boolean
=
false
var
debugDisableCoroutineAgent
:
Boolean
=
false
companion
object
{
...
...
idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/filter/DebuggerFiltersUtil.kt
浏览文件 @
8b5f2f94
...
...
@@ -18,18 +18,17 @@ package org.jetbrains.kotlin.idea.debugger.filter
import
com.intellij.debugger.settings.DebuggerSettings
import
com.intellij.ui.classFilter.ClassFilter
import
org.jetbrains.kotlin.idea.debugger.KotlinDebuggerSettings
private
const
val
KOTLIN_STDLIB_FILTER
=
"kotlin.*"
fun
addKotlinStdlibDebugFilterIfNeeded
()
{
if
(!
KotlinDebuggerSettings
.
getInstance
().
isFilterForStdlibAlreadyAdded
)
{
val
settings
=
DebuggerSettings
.
getInstance
()
!!
val
newFilters
=
(
settings
.
steppingFilters
+
ClassFilter
(
KOTLIN_STDLIB_FILTER
))
val
settings
=
DebuggerSettings
.
getInstance
()
?:
return
val
existingFilters
=
settings
.
steppingFilters
settings
.
steppingFilters
=
newFilters
KotlinDebuggerSettings
.
getInstance
().
isFilterForStdlibAlreadyAdded
=
true
if
(
existingFilters
.
any
{
it
.
pattern
==
KOTLIN_STDLIB_FILTER
})
{
return
}
settings
.
steppingFilters
=
settings
.
steppingFilters
+
ClassFilter
(
KOTLIN_STDLIB_FILTER
)
}
idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/preference/DebuggerPreferenceKey.kt
浏览文件 @
8b5f2f94
...
...
@@ -32,7 +32,6 @@ internal object DebuggerPreferenceKeys {
val
DISABLE_KOTLIN_INTERNAL_CLASSES
by
debuggerPreferenceKey
(
false
)
val
RENDER_DELEGATED_PROPERTIES
by
debuggerPreferenceKey
(
false
)
val
IS_FILTER_FOR_STDLIB_ALREADY_ADDED
by
debuggerPreferenceKey
(
false
)
val
FORCE_RANKING
by
debuggerPreferenceKey
(
false
)
...
...
idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/preference/SettingsMutators.kt
浏览文件 @
8b5f2f94
...
...
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.idea.debugger.DebuggerUtils
import
org.jetbrains.kotlin.idea.debugger.KotlinDebuggerSettings
import
org.jetbrains.kotlin.idea.debugger.ToggleKotlinVariablesState
import
org.jetbrains.kotlin.idea.debugger.test.preference.DebuggerPreferenceKeys.DISABLE_KOTLIN_INTERNAL_CLASSES
import
org.jetbrains.kotlin.idea.debugger.test.preference.DebuggerPreferenceKeys.IS_FILTER_FOR_STDLIB_ALREADY_ADDED
import
org.jetbrains.kotlin.idea.debugger.test.preference.DebuggerPreferenceKeys.RENDER_DELEGATED_PROPERTIES
import
org.jetbrains.kotlin.idea.debugger.test.preference.DebuggerPreferenceKeys.SKIP_CLASSLOADERS
import
org.jetbrains.kotlin.idea.debugger.test.preference.DebuggerPreferenceKeys.SKIP_CONSTRUCTORS
...
...
@@ -29,7 +28,6 @@ internal val SettingsMutators: List<SettingsMutator<*>> = listOf(
DebuggerSettingsMutator
(
SKIP_GETTERS
,
DebuggerSettings
::
SKIP_GETTERS
),
KotlinSettingsMutator
(
DISABLE_KOTLIN_INTERNAL_CLASSES
,
KotlinDebuggerSettings
::
disableKotlinInternalClasses
),
KotlinSettingsMutator
(
RENDER_DELEGATED_PROPERTIES
,
KotlinDebuggerSettings
::
renderDelegatedProperties
),
KotlinSettingsMutator
(
IS_FILTER_FOR_STDLIB_ALREADY_ADDED
,
KotlinDebuggerSettings
::
isFilterForStdlibAlreadyAdded
),
KotlinVariablesModeSettingsMutator
,
JvmTargetSettingsMutator
,
ForceRankingSettingsMutator
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录