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

IDE TypeUtils moved to idea-analysis

Browse Source
This commit is contained in:
Andrey Breslav
2014-10-07 20:02:51 +04:00
parent e418a763db
commit 94f4ddb762
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/util/TypeUtils.kt → idea/idea-analysis/src/org/jetbrains/jet/plugin/util/TypeUtils.kt
View File
idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
+2 -1
View File
@@ -56,6 +56,7 @@ import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil;
import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache; import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache;
import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
import org.jetbrains.jet.plugin.util.UtilPackage; import org.jetbrains.jet.plugin.util.UtilPackage;
import org.jetbrains.jet.plugin.util.string.StringPackage;
import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.renderer.DescriptorRenderer;
import javax.swing.*; import javax.swing.*;
@@ -503,7 +504,7 @@ public class JetRefactoringUtil {
} }
public static String getExpressionShortText(@NotNull JetElement element) { //todo: write appropriate implementation public static String getExpressionShortText(@NotNull JetElement element) { //todo: write appropriate implementation
return UtilPackage.collapseSpaces(StringUtil.shortenTextWithEllipsis(element.getText(), 53, 0)); return StringPackage.collapseSpaces(StringUtil.shortenTextWithEllipsis(element.getText(), 53, 0));
} }
@Nullable @Nullable
idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt
+1 -3
View File
@@ -44,7 +44,6 @@ import com.intellij.openapi.application.ApplicationManager
import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException
import com.intellij.refactoring.ui.ConflictsDialog import com.intellij.refactoring.ui.ConflictsDialog
import com.intellij.util.containers.MultiMap import com.intellij.util.containers.MultiMap
import com.intellij.openapi.command.CommandProcessor
import org.jetbrains.jet.lang.psi.codeFragmentUtil.skipVisibilityCheck import org.jetbrains.jet.lang.psi.codeFragmentUtil.skipVisibilityCheck
import com.intellij.ide.util.PsiElementListCellRenderer import com.intellij.ide.util.PsiElementListCellRenderer
import com.intellij.openapi.ui.popup.JBPopup import com.intellij.openapi.ui.popup.JBPopup
@@ -67,14 +66,13 @@ import org.jetbrains.jet.lang.resolve.BindingContext
import org.jetbrains.jet.lang.psi.psiUtil.getParentByType import org.jetbrains.jet.lang.psi.psiUtil.getParentByType
import org.jetbrains.jet.lang.psi.psiUtil.isAncestor import org.jetbrains.jet.lang.psi.psiUtil.isAncestor
import org.jetbrains.jet.plugin.caches.resolve.getLazyResolveSession import org.jetbrains.jet.plugin.caches.resolve.getLazyResolveSession
import org.jetbrains.jet.plugin.util.application.runWriteAction
import com.intellij.psi.PsiNamedElement import com.intellij.psi.PsiNamedElement
import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
import org.jetbrains.jet.renderer.DescriptorRenderer import org.jetbrains.jet.renderer.DescriptorRenderer
import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.util.text.StringUtil
import org.jetbrains.jet.plugin.util.collapseSpaces
import javax.swing.Icon import javax.swing.Icon
import org.jetbrains.jet.plugin.util.string.collapseSpaces
/** /**
* Replace [[JetSimpleNameExpression]] (and its enclosing qualifier) with qualified element given by FqName * Replace [[JetSimpleNameExpression]] (and its enclosing qualifier) with qualified element given by FqName
idea/src/org/jetbrains/jet/plugin/util/stringUtil.kt
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.plugin.util package org.jetbrains.jet.plugin.util.string
fun String.collapseSpaces(): String { fun String.collapseSpaces(): String {
val builder = StringBuilder() val builder = StringBuilder()