From 22227663deb325cc541b447db0120a80974cd72c Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Tue, 28 Aug 2012 18:52:25 +0400 Subject: [PATCH] add 'isSafe' to FqNameUnsafe --- .../src/org/jetbrains/jet/lang/resolve/name/FqName.java | 2 +- .../org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqName.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqName.java index 09125825bb8..1cbbd1cb246 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqName.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqName.java @@ -62,7 +62,7 @@ public class FqName extends FqNameBase { } } - private static boolean isValidAfterUnsafeCheck(@NotNull String qualifiedName) { + /*package*/ static boolean isValidAfterUnsafeCheck(@NotNull String qualifiedName) { // TODO: There's a valid name with escape char `` return qualifiedName.indexOf('<') < 0; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java index 9745c8d1440..e27fe60d4d3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java @@ -91,6 +91,13 @@ public class FqNameUnsafe extends FqNameBase { return fqName; } + public boolean isSafe() { + if (safe != null) { + return true; + } + return FqName.isValidAfterUnsafeCheck(getFqName()); + } + @NotNull public FqName toSafe() { if (safe != null) {