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

build: no classes rename in jarjar

Browse Source 
build: fixed proguard shrinking
This commit is contained in:
Leonid Shalupov
2013-02-12 16:06:15 +04:00
committed by Andrey Breslav
parent a5cecd6048
commit 0a1303d118
9 changed files with 42 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt
+4 -4
View File
@@ -1,9 +1,9 @@
package org.jetbrains.kotlin.doc.highlighter
import org.jetbrains.jet.internal.com.intellij.psi.PsiComment
import org.jetbrains.jet.internal.com.intellij.psi.PsiElement
import org.jetbrains.jet.internal.com.intellij.psi.PsiFile
import org.jetbrains.jet.internal.com.intellij.psi.PsiWhiteSpace
import com.intellij.psi.PsiComment
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import com.intellij.psi.PsiWhiteSpace
import org.jetbrains.jet.lang.psi.*
class HtmlKotlinVisitor: JetTreeVisitor<StringBuilder>() {
libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt
+3 -3
View File
@@ -2,9 +2,9 @@ package org.jetbrains.kotlin.doc.highlighter
import java.util.HashMap
import kotlin.template.HtmlFormatter
import org.jetbrains.jet.internal.com.intellij.psi.*
import org.jetbrains.jet.internal.com.intellij.psi.tree.IElementType
import org.jetbrains.jet.internal.com.intellij.psi.tree.TokenSet
import com.intellij.psi.*
import com.intellij.psi.tree.IElementType
import com.intellij.psi.tree.TokenSet
import org.jetbrains.jet.lexer.*
fun main(args: Array<String>) {
libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt
+4 -4
View File
@@ -1,10 +1,10 @@
package org.jetbrains.kotlin.doc.highlighter2
import java.io.File
import org.jetbrains.jet.internal.com.intellij.openapi.vfs.local.CoreLocalVirtualFile
import org.jetbrains.jet.internal.com.intellij.psi.PsiElement
import org.jetbrains.jet.internal.com.intellij.psi.PsiFile
import org.jetbrains.jet.internal.com.intellij.psi.impl.source.tree.LeafPsiElement
import com.intellij.openapi.vfs.local.CoreLocalVirtualFile
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import com.intellij.psi.impl.source.tree.LeafPsiElement
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.kotlin.doc.*
import org.jetbrains.kotlin.doc.model.KModel
libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/psiUtils.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package org.jetbrains.kotlin.doc.highlighter2
import org.jetbrains.jet.internal.com.intellij.psi.PsiElement
import com.intellij.psi.PsiElement
private fun PsiElement.getTextChildRelativeOffset() =
getTextRange()!!.getStartOffset() - getParent()!!.getTextRange()!!.getStartOffset()
libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
+5 -5
View File
@@ -2,11 +2,11 @@ package org.jetbrains.kotlin.doc.model
import java.io.File
import java.util.*
import org.jetbrains.jet.internal.com.intellij.openapi.vfs.local.CoreLocalVirtualFile
import org.jetbrains.jet.internal.com.intellij.psi.PsiDirectory
import org.jetbrains.jet.internal.com.intellij.psi.PsiElement
import org.jetbrains.jet.internal.com.intellij.psi.PsiFile
import org.jetbrains.jet.internal.com.intellij.psi.PsiFileSystemItem
import com.intellij.openapi.vfs.local.CoreLocalVirtualFile
import com.intellij.psi.PsiDirectory
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import com.intellij.psi.PsiFileSystemItem
import org.jetbrains.jet.lang.descriptors.CallableDescriptor
import org.jetbrains.jet.lang.descriptors.ClassDescriptor
import org.jetbrains.jet.lang.descriptors.ClassKind
libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt
+6 -6
View File
@@ -3,12 +3,12 @@ package test.kotlin
import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment
import org.jetbrains.jet.config.CompilerConfiguration
import org.jetbrains.jet.internal.com.intellij.openapi.Disposable
import org.jetbrains.jet.internal.com.intellij.openapi.util.Disposer
import org.jetbrains.jet.internal.com.intellij.openapi.vfs.CharsetToolkit
import org.jetbrains.jet.internal.com.intellij.psi.PsiFileFactory
import org.jetbrains.jet.internal.com.intellij.psi.impl.PsiFileFactoryImpl
import org.jetbrains.jet.internal.com.intellij.testFramework.LightVirtualFile
import com.intellij.openapi.Disposable
import com.intellij.openapi.util.Disposer
import com.intellij.openapi.vfs.CharsetToolkit
import com.intellij.psi.PsiFileFactory
import com.intellij.psi.impl.PsiFileFactoryImpl
import com.intellij.testFramework.LightVirtualFile
import org.jetbrains.jet.lang.psi.JetFile
import org.jetbrains.jet.plugin.JetLanguage
import org.jetbrains.jet.utils.PathUtil