From 4c9907985947581e1cd04cec07bad4d4ebe44309 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Thu, 16 Oct 2014 13:19:56 +0400 Subject: [PATCH] explicit range check removed --- .../src/com/intellij/lang/folding/FoldingDescriptor.java | 1 - .../src/com/intellij/openapi/editor/impl/IntervalTreeImpl.java | 1 - .../psi/impl/smartPointers/InjectedSelfElementInfo.java | 1 - .../impl/source/tree/injected/InjectedLanguageManagerImpl.java | 2 -- .../impl/statements/expressions/literals/GrLiteralEscaper.java | 1 - .../intellij/lang/properties/psi/impl/PropertyImplEscaper.java | 1 - 6 files changed, 7 deletions(-) diff --git a/platform/core-api/src/com/intellij/lang/folding/FoldingDescriptor.java b/platform/core-api/src/com/intellij/lang/folding/FoldingDescriptor.java index 21c866325dcf..331841b467b9 100644 --- a/platform/core-api/src/com/intellij/lang/folding/FoldingDescriptor.java +++ b/platform/core-api/src/com/intellij/lang/folding/FoldingDescriptor.java @@ -95,7 +95,6 @@ public class FoldingDescriptor { boolean neverExpands) { assert range.getLength() > 0 : range + ", text: " + node.getText() + ", language = " + node.getPsi().getLanguage(); myElement = node; - TextRange.assertProperRange(range); myRange = range; myGroup = group; myDependencies = dependencies; diff --git a/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTreeImpl.java b/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTreeImpl.java index 68e8d2500314..671bcc389089 100644 --- a/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTreeImpl.java +++ b/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTreeImpl.java @@ -590,7 +590,6 @@ public abstract class IntervalTreeImpl extends RedBla @NotNull PeekableIterator overlappingIterator(@NotNull final TextRangeInterval rangeInterval) { - TextRange.assertProperRange(rangeInterval); l.readLock().lock(); diff --git a/platform/core-impl/src/com/intellij/psi/impl/smartPointers/InjectedSelfElementInfo.java b/platform/core-impl/src/com/intellij/psi/impl/smartPointers/InjectedSelfElementInfo.java index ce343b517726..fe8f166a5aa9 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/smartPointers/InjectedSelfElementInfo.java +++ b/platform/core-impl/src/com/intellij/psi/impl/smartPointers/InjectedSelfElementInfo.java @@ -46,7 +46,6 @@ class InjectedSelfElementInfo extends SelfElementInfo { @NotNull PsiElement hostContext) { super(project, hostContext); assert containingFile.getViewProvider() instanceof FreeThreadedFileViewProvider : "element parameter must be an injected element: "+injectedElement+"; "+containingFile; - TextRange.assertProperRange(injectedRange); assert containingFile.getTextRange().contains(injectedRange) : "Injected range outside the file: "+injectedRange +"; file: "+containingFile.getTextRange(); TextRange hostRange = InjectedLanguageManager.getInstance(project).injectedToHost(injectedElement, injectedRange); diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageManagerImpl.java index 85472e245b1f..a8bd76a3eb6c 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageManagerImpl.java @@ -206,7 +206,6 @@ public class InjectedLanguageManagerImpl extends InjectedLanguageManager impleme @Override @NotNull public TextRange injectedToHost(@NotNull PsiElement injectedContext, @NotNull TextRange injectedTextRange) { - TextRange.assertProperRange(injectedTextRange); PsiFile file = injectedContext.getContainingFile(); if (file == null) return injectedTextRange; Document document = PsiDocumentManager.getInstance(file.getProject()).getCachedDocument(file); @@ -469,7 +468,6 @@ public class InjectedLanguageManagerImpl extends InjectedLanguageManager impleme InjectedLanguagePlaces placesRegistrar = new InjectedLanguagePlaces() { @Override public void addPlace(@NotNull Language language, @NotNull TextRange rangeInsideHost, @NonNls @Nullable String prefix, @NonNls @Nullable String suffix) { - TextRange.assertProperRange(rangeInsideHost); injectionPlacesRegistrar .startInjecting(language) .addPlace(prefix, suffix, host, rangeInsideHost) diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/literals/GrLiteralEscaper.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/literals/GrLiteralEscaper.java index 9f10b909852d..c1101a2123b2 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/literals/GrLiteralEscaper.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/literals/GrLiteralEscaper.java @@ -33,7 +33,6 @@ public class GrLiteralEscaper extends LiteralTextEscaper { @Override public boolean decode(@NotNull TextRange rangeInsideHost, @NotNull StringBuilder outChars) { - TextRange.assertProperRange(rangeInsideHost); String subText = rangeInsideHost.substring(myHost.getText()); outSourceOffsets = new int[subText.length() + 1]; diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/psi/impl/PropertyImplEscaper.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/psi/impl/PropertyImplEscaper.java index aba503fdcfe4..c4d6d8983f81 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/psi/impl/PropertyImplEscaper.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/psi/impl/PropertyImplEscaper.java @@ -19,7 +19,6 @@ public class PropertyImplEscaper extends LiteralTextEscaper { @Override public boolean decode(@NotNull TextRange rangeInsideHost, @NotNull StringBuilder outChars) { - TextRange.assertProperRange(rangeInsideHost); String subText = rangeInsideHost.substring(myHost.getText()); outSourceOffsets = new int[subText.length() + 1]; int prefixLen = outChars.length();