From f216063703ebf3160e868e4e49b891b6867321ec Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 13 Jan 2016 16:31:25 +0100 Subject: [PATCH] =?UTF-8?q?ElectronDebugTest=20=E2=80=94=20passed.=20Suppo?= =?UTF-8?q?rt=20debug=20pure=20js=20file=20in=20the=20ASAR=20=E2=80=94=20w?= =?UTF-8?q?e=20resolve=20real=20file=20in=20the=20project=20using=20source?= =?UTF-8?q?=20content?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/annotations/jdk/java/nio/file/annotations.xml | 3 +++ platform/built-in-server/client/node-rpc-client/package.json | 1 - .../src/com/intellij/openapi/util/io/fileUtil.kt | 4 ++-- .../src/org/jetbrains/debugger/frame/AsyncFramesHeader.kt | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/annotations/jdk/java/nio/file/annotations.xml b/lib/annotations/jdk/java/nio/file/annotations.xml index 6706a3e31d7b..4fc7d46c809e 100644 --- a/lib/annotations/jdk/java/nio/file/annotations.xml +++ b/lib/annotations/jdk/java/nio/file/annotations.xml @@ -2,6 +2,9 @@ + + + diff --git a/platform/built-in-server/client/node-rpc-client/package.json b/platform/built-in-server/client/node-rpc-client/package.json index 054e9913fa0f..40f2601a636c 100644 --- a/platform/built-in-server/client/node-rpc-client/package.json +++ b/platform/built-in-server/client/node-rpc-client/package.json @@ -13,7 +13,6 @@ "url": "https://github.com/JetBrains/intellij-community.git" }, "devDependencies": { - "dts-generator": "^1.6.3", "mocha": "^2.3.4", "rimraf": "^2.5.0", "should": "^8.0.2", diff --git a/platform/platform-impl/src/com/intellij/openapi/util/io/fileUtil.kt b/platform/platform-impl/src/com/intellij/openapi/util/io/fileUtil.kt index e64dd11a62da..eeb97cb8c019 100644 --- a/platform/platform-impl/src/com/intellij/openapi/util/io/fileUtil.kt +++ b/platform/platform-impl/src/com/intellij/openapi/util/io/fileUtil.kt @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 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. @@ -23,7 +23,7 @@ val File.systemIndependentPath: String get() = path.replace(File.separatorChar, '/') val File.parentSystemIndependentPath: String - get() = getParent().replace(File.separatorChar, '/') + get() = parent.replace(File.separatorChar, '/') // PathUtilRt.getParentPath returns empty string if no parent path, but in Kotlin "null" is better because elvis operator could be used fun getParentPath(path: String) = StringUtil.nullize(PathUtilRt.getParentPath(path)) diff --git a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/AsyncFramesHeader.kt b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/AsyncFramesHeader.kt index 3c6c267fb24d..5a07ddb3ed10 100644 --- a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/AsyncFramesHeader.kt +++ b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/AsyncFramesHeader.kt @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 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. @@ -20,7 +20,7 @@ import com.intellij.ui.SimpleTextAttributes import com.intellij.util.ui.UIUtil import com.intellij.xdebugger.frame.XStackFrame -class AsyncFramesHeader(val asyncFunctionName: String) : XStackFrame() { +internal class AsyncFramesHeader(val asyncFunctionName: String) : XStackFrame() { override fun customizePresentation(component: ColoredTextContainer) { component.append("Async call from ", PREFIX_ATTRIBUTES) component.append(asyncFunctionName, NAME_ATTRIBUTES)