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

Deprecated 'INSTANCE$' replaced with 'INSTANCE'

Browse Source
This commit is contained in:
Michael Bogdanov
2015-12-24 10:36:13 +03:00
parent 80fd9e3cbb
commit aeb6486473
98 changed files with 187 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java
+3 -3
View File
@@ -239,7 +239,7 @@ public class SourceNavigationHelper {
@NotNull Project project
) {
TargetPlatform platform = TargetPlatform.Default.INSTANCE$;
TargetPlatform platform = TargetPlatform.Default.INSTANCE;
MutableModuleContext newModuleContext = ContextKt.ContextForNewModule(
project, Name.special("<library module>"),
ModuleDescriptorKt.ModuleParameters(
@@ -375,13 +375,13 @@ public class SourceNavigationHelper {
);
}
}
return LightClassUtil.INSTANCE$.getPsiClass(classOrObject);
return LightClassUtil.INSTANCE.getPsiClass(classOrObject);
}
@Nullable
public static PsiClass getOriginalClass(@NotNull KtClassOrObject classOrObject) {
// Copied from JavaPsiImplementationHelperImpl:getOriginalClass()
String internalName = PsiCodegenPredictor.getPredefinedJvmInternalName(classOrObject, NoResolveFileClassesProvider.INSTANCE$);
String internalName = PsiCodegenPredictor.getPredefinedJvmInternalName(classOrObject, NoResolveFileClassesProvider.INSTANCE);
if (internalName == null) {
return null;
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class DuplicateJvmSignatureAnnotator implements Annotator {
if (!ProjectRootsUtil.isInProjectSource(element)) return;
PsiFile file = element.getContainingFile();
if (!(file instanceof KtFile) || TargetPlatformDetector.getPlatform((KtFile) file) != JvmPlatform.INSTANCE$) return;
if (!(file instanceof KtFile) || TargetPlatformDetector.getPlatform((KtFile) file) != JvmPlatform.INSTANCE) return;
Diagnostics otherDiagnostics = ResolutionUtils.analyzeFully((KtElement) element).getDiagnostics();
GlobalSearchScope moduleScope = GetModuleInfoKt.getModuleInfo(element).contentScope();
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java
+1 -1
View File
@@ -210,7 +210,7 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer {
options.setModifiers(Collections.<DescriptorRendererModifier>emptySet());
options.setValueParametersHandler(VALUE_PARAMETERS_HANDLER);
options.setTextFormat(RenderingFormat.HTML);
return Unit.INSTANCE$;
return Unit.INSTANCE;
}
});
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java
+2 -2
View File
@@ -155,8 +155,8 @@ public class IdeErrorMessages {
"</html>",
HTML_THROWABLE);
MAP.put(ErrorsJs.JSCODE_ERROR, "<html>JavaScript: {0}</html>", JsCallDataHtmlRenderer.INSTANCE$);
MAP.put(ErrorsJs.JSCODE_WARNING, "<html>JavaScript: {0}</html>", JsCallDataHtmlRenderer.INSTANCE$);
MAP.put(ErrorsJs.JSCODE_ERROR, "<html>JavaScript: {0}</html>", JsCallDataHtmlRenderer.INSTANCE);
MAP.put(ErrorsJs.JSCODE_WARNING, "<html>JavaScript: {0}</html>", JsCallDataHtmlRenderer.INSTANCE);
MAP.setImmutable();
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java
+3 -3
View File
@@ -50,14 +50,14 @@ public class TargetPlatformDetector {
@NotNull
public static TargetPlatform getPlatform(@NotNull Module module) {
if (ProjectStructureUtil.isJsKotlinModule(module)) {
return JsPlatform.INSTANCE$;
return JsPlatform.INSTANCE;
}
return JvmPlatform.INSTANCE$;
return JvmPlatform.INSTANCE;
}
@NotNull
public static TargetPlatform getDefaultPlatform() {
LOG.info("Using default platform");
return JvmPlatform.INSTANCE$;
return JvmPlatform.INSTANCE;
}
}