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

Rewrite utils method for qualified names to Kotlin

Browse Source
This commit is contained in:
Nikolay Krasko
2014-02-18 18:06:03 +04:00
parent ac4fe93774
commit 592969bad1
16 changed files with 192 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
* Copyright 2010-2014 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.
@@ -26,8 +26,8 @@ import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor;
import org.jetbrains.jet.lang.psi.JetNamed;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.name.NamePackage;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.util.QualifiedNamesUtil;
import java.util.Arrays;
import java.util.Collection;
@@ -80,7 +80,7 @@ public class ResolveSessionUtils {
while (true) {
PackageViewDescriptor packageDescriptor = analyzer.getModuleDescriptor().getPackage(packageFqName);
if (packageDescriptor != null) {
FqName classInPackagePath = new FqName(QualifiedNamesUtil.tail(packageFqName, fqName));
FqName classInPackagePath = NamePackage.tail(fqName, packageFqName);
Collection<ClassDescriptor> descriptors = getClassOrObjectDescriptorsByFqName(packageDescriptor, classInPackagePath, filter);
classDescriptors.addAll(descriptors);
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java
+3 -3
View File
@@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.storage.MemoizedFunctionToNullable;
import org.jetbrains.jet.storage.NotNullLazyValue;
import org.jetbrains.jet.storage.StorageManager;
import org.jetbrains.jet.util.QualifiedNamesUtil;
import org.jetbrains.jet.lang.resolve.name.NamePackage;
import java.util.Collection;
import java.util.Collections;
@@ -110,12 +110,12 @@ public class FileBasedDeclarationProviderFactory implements DeclarationProviderF
Collection<NavigatablePsiElement> resultElements = Lists.newArrayList();
for (FqName declaredPackage : index.invoke().filesByPackage.keys()) {
if (QualifiedNamesUtil.isSubpackageOf(declaredPackage, fqName)) {
if (NamePackage.isSubpackageOf(declaredPackage, fqName)) {
Collection<JetFile> files = index.invoke().filesByPackage.get(declaredPackage);
resultElements.addAll(ContainerUtil.map(files, new Function<JetFile, NavigatablePsiElement>() {
@Override
public NavigatablePsiElement fun(JetFile file) {
return JetPsiUtil.getPackageReference(file, QualifiedNamesUtil.numberOfSegments(fqName) - 1);
return JetPsiUtil.getPackageReference(file, NamePackage.numberOfSegments(fqName) - 1);
}
}));
}
compiler/frontend/src/org/jetbrains/jet/util/QualifiedNamesUtil.java
-202
View File
@@ -1,202 +0,0 @@
/*
* Copyright 2010-2013 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.jet.util;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.ImportPath;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
/**
* Common methods for working with qualified names.
*/
public final class QualifiedNamesUtil {
private QualifiedNamesUtil() {
}
public static boolean isSubpackageOf(@NotNull FqName subpackageName, @NotNull FqName packageName) {
if (subpackageName.equals(packageName)) {
return true;
}
if (packageName.isRoot()) {
return true;
}
String subpackageNameStr = subpackageName.asString();
String packageNameStr = packageName.asString();
return isSubpackageOf(subpackageNameStr, packageNameStr);
}
public static boolean isOneSegmentFQN(@NotNull String fqn) {
if (fqn.isEmpty()) {
return false;
}
return fqn.indexOf('.') < 0;
}
public static boolean isOneSegmentFQN(@NotNull FqName fqn) {
return isOneSegmentFQN(fqn.asString());
}
@NotNull
public static String getFirstSegment(@NotNull String fqn) {
int dotIndex = fqn.indexOf('.');
return (dotIndex != -1) ? fqn.substring(0, dotIndex) : fqn;
}
@NotNull
public static FqName withoutLastSegment(@NotNull FqName fqName) {
return fqName.parent();
}
@NotNull
public static FqName withoutFirstSegment(@NotNull FqName fqName) {
if (fqName.isRoot() || fqName.parent().isRoot()) {
return FqName.ROOT;
}
String fqNameStr = fqName.asString();
return new FqName(fqNameStr.substring(fqNameStr.indexOf('.'), fqNameStr.length()));
}
public static int numberOfSegments(@NotNull FqName fqName) {
if (fqName.isRoot()) {
return 0;
}
return 1 + numberOfSegments(fqName.parent());
}
@NotNull
public static FqName combine(@NotNull FqName first, @NotNull Name second) {
return first.child(second);
}
/**
* Get tail part of the full fqn by subtracting head part.
*
* @param headFQN
* @param fullFQN
* @return tail fqn. If first part is not a begging of the full fqn, fullFQN will be returned.
*/
@NotNull
public static String tail(@NotNull FqName headFQN, @NotNull FqName fullFQN) {
if (!isSubpackageOf(fullFQN, headFQN) || headFQN.isRoot()) {
return fullFQN.asString();
}
return fullFQN.equals(headFQN) ?
"" :
fullFQN.asString().substring(headFQN.asString().length() + 1); // (headFQN + '.').length
}
/**
* Add one segment of nesting to given qualified name according to the full qualified name.
*
* @param fqn
* @param fullFQN
* @return qualified name with one more segment or null if fqn is not head part of fullFQN or there's no additional segment.
*/
@Nullable
public static FqName plusOneSegment(@NotNull FqName fqn, @NotNull FqName fullFQN) {
if (!isSubpackageOf(fullFQN, fqn)) {
return null;
}
String nextSegment = getFirstSegment(tail(fqn, fullFQN));
if (isOneSegmentFQN(nextSegment)) {
return combine(fqn, Name.guess(nextSegment));
}
return null;
}
public static boolean isImported(@NotNull ImportPath alreadyImported, @NotNull FqName fqName) {
if (alreadyImported.hasAlias()) {
return false;
}
if (alreadyImported.isAllUnder() && !fqName.isRoot()) {
return alreadyImported.fqnPart().equals(fqName.parent());
}
return alreadyImported.fqnPart().equals(fqName);
}
public static boolean isImported(@NotNull ImportPath alreadyImported, @NotNull ImportPath newImport) {
if (newImport.isAllUnder() || newImport.hasAlias()) {
return alreadyImported.equals(newImport);
}
return isImported(alreadyImported, newImport.fqnPart());
}
public static boolean isImported(@NotNull Iterable<ImportPath> imports, @NotNull ImportPath newImport) {
for (ImportPath alreadyImported : imports) {
if (isImported(alreadyImported, newImport)) {
return true;
}
}
return false;
}
public static boolean isValidJavaFqName(@Nullable String qualifiedName) {
if (qualifiedName == null) return false;
// Check that it is javaName(\.javaName)* or an empty string
class State {}
State BEGINNING = new State();
State MIDDLE = new State();
State AFTER_DOT = new State();
State state = BEGINNING;
int length = qualifiedName.length();
for (int i = 0; i < length; i++) {
char c = qualifiedName.charAt(i);
if (state == BEGINNING || state == AFTER_DOT) {
if (!Character.isJavaIdentifierPart(c)) return false;
state = MIDDLE;
}
//noinspection ConstantConditions
assert state == MIDDLE;
if (c == '.') {
state = AFTER_DOT;
}
else if (!Character.isJavaIdentifierPart(c)) {
return false;
}
}
return state != AFTER_DOT;
}
public static boolean isSubpackageOf(String subpackageNameStr, String packageNameStr) {
return subpackageNameStr.equals(packageNameStr) ||
(subpackageNameStr.startsWith(packageNameStr) && subpackageNameStr.charAt(packageNameStr.length()) == '.');
}
}
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java
+4 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
* Copyright 2010-2014 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.
@@ -41,7 +41,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.java.JavaPsiFacadeKotlinHacks;
import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.util.QualifiedNamesUtil;
import org.jetbrains.jet.lang.resolve.name.NamePackage;
import java.util.Collection;
import java.util.List;
@@ -110,7 +110,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
}
private PsiClass[] doFindClasses(String qualifiedNameString, GlobalSearchScope scope) {
if (!QualifiedNamesUtil.isValidJavaFqName(qualifiedNameString)) {
if (!NamePackage.isValidJavaFqName(qualifiedNameString)) {
return PsiClass.EMPTY_ARRAY;
}
@@ -182,7 +182,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
@Override
public PsiPackage findPackage(@NotNull String qualifiedNameString) {
if (!QualifiedNamesUtil.isValidJavaFqName(qualifiedNameString)) {
if (!NamePackage.isValidJavaFqName(qualifiedNameString)) {
return null;
}
compiler/tests/org/jetbrains/jet/FqNameTest.java
+18 -18
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
* Copyright 2010-2014 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.google.common.collect.Lists;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.util.QualifiedNamesUtil;
import org.jetbrains.jet.lang.resolve.name.NamePackage;
import org.junit.Assert;
import org.junit.Test;
@@ -104,22 +104,22 @@ public class FqNameTest {
@Test
public void isValidJavaFqName() {
Assert.assertTrue(QualifiedNamesUtil.isValidJavaFqName(""));
Assert.assertTrue(QualifiedNamesUtil.isValidJavaFqName("a"));
Assert.assertTrue(QualifiedNamesUtil.isValidJavaFqName("1"));
Assert.assertTrue(QualifiedNamesUtil.isValidJavaFqName("a.a"));
Assert.assertTrue(QualifiedNamesUtil.isValidJavaFqName("org.jetbrains"));
Assert.assertTrue(QualifiedNamesUtil.isValidJavaFqName("$"));
Assert.assertTrue(QualifiedNamesUtil.isValidJavaFqName("org.A$B"));
Assert.assertTrue(NamePackage.isValidJavaFqName(""));
Assert.assertTrue(NamePackage.isValidJavaFqName("a"));
Assert.assertTrue(NamePackage.isValidJavaFqName("1"));
Assert.assertTrue(NamePackage.isValidJavaFqName("a.a"));
Assert.assertTrue(NamePackage.isValidJavaFqName("org.jetbrains"));
Assert.assertTrue(NamePackage.isValidJavaFqName("$"));
Assert.assertTrue(NamePackage.isValidJavaFqName("org.A$B"));
Assert.assertFalse(QualifiedNamesUtil.isValidJavaFqName("."));
Assert.assertFalse(QualifiedNamesUtil.isValidJavaFqName(".."));
Assert.assertFalse(QualifiedNamesUtil.isValidJavaFqName("a."));
Assert.assertFalse(QualifiedNamesUtil.isValidJavaFqName(".a"));
Assert.assertFalse(QualifiedNamesUtil.isValidJavaFqName("a..b"));
Assert.assertFalse(QualifiedNamesUtil.isValidJavaFqName("a.b.."));
Assert.assertFalse(QualifiedNamesUtil.isValidJavaFqName("a.b."));
Assert.assertFalse(QualifiedNamesUtil.isValidJavaFqName("a.b...)"));
Assert.assertFalse(QualifiedNamesUtil.isValidJavaFqName("a.b.<special>"));
Assert.assertFalse(NamePackage.isValidJavaFqName("."));
Assert.assertFalse(NamePackage.isValidJavaFqName(".."));
Assert.assertFalse(NamePackage.isValidJavaFqName("a."));
Assert.assertFalse(NamePackage.isValidJavaFqName(".a"));
Assert.assertFalse(NamePackage.isValidJavaFqName("a..b"));
Assert.assertFalse(NamePackage.isValidJavaFqName("a.b.."));
Assert.assertFalse(NamePackage.isValidJavaFqName("a.b."));
Assert.assertFalse(NamePackage.isValidJavaFqName("a.b...)"));
Assert.assertFalse(NamePackage.isValidJavaFqName("a.b.<special>"));
}
}