diff --git a/platform/util/diff/apiDump.txt b/platform/util/diff/apiDump.txt new file mode 100644 index 000000000000..9f1f66a8213d --- /dev/null +++ b/platform/util/diff/apiDump.txt @@ -0,0 +1,340 @@ +f:com.intellij.diff.comparison.ByCharRt +- s:compare(java.lang.CharSequence,java.lang.CharSequence,com.intellij.diff.comparison.CancellationChecker):com.intellij.diff.comparison.iterables.FairDiffIterable +- s:compareIgnoreWhitespaces(java.lang.CharSequence,java.lang.CharSequence,com.intellij.diff.comparison.CancellationChecker):com.intellij.diff.comparison.iterables.DiffIterable +- s:comparePunctuation(java.lang.CharSequence,java.lang.CharSequence,com.intellij.diff.comparison.CancellationChecker):com.intellij.diff.comparison.iterables.FairDiffIterable +- s:compareTrimWhitespaces(java.lang.CharSequence,java.lang.CharSequence,com.intellij.diff.comparison.CancellationChecker):com.intellij.diff.comparison.iterables.DiffIterable +- s:compareTwoStep(java.lang.CharSequence,java.lang.CharSequence,com.intellij.diff.comparison.CancellationChecker):com.intellij.diff.comparison.iterables.FairDiffIterable +f:com.intellij.diff.comparison.ByLineRt +- s:compare(java.util.List,java.util.List,com.intellij.diff.comparison.ComparisonPolicy,com.intellij.diff.comparison.CancellationChecker):com.intellij.diff.comparison.iterables.FairDiffIterable +- s:compare(java.util.List,java.util.List,java.util.List,com.intellij.diff.comparison.ComparisonPolicy,com.intellij.diff.comparison.CancellationChecker):java.util.List +- s:convertIntoMergeLineFragments(java.util.List):java.util.List +- s:merge(java.util.List,java.util.List,java.util.List,com.intellij.diff.comparison.ComparisonPolicy,com.intellij.diff.comparison.CancellationChecker):java.util.List +f:com.intellij.diff.comparison.ByWordRt +- s:compare(java.lang.CharSequence,java.lang.CharSequence,com.intellij.diff.comparison.ComparisonPolicy,com.intellij.diff.comparison.CancellationChecker):java.util.List +- s:compare(java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,com.intellij.diff.comparison.ComparisonPolicy,com.intellij.diff.comparison.CancellationChecker):java.util.List +- s:compare(java.lang.CharSequence,java.util.List,java.lang.CharSequence,java.util.List,com.intellij.diff.comparison.ComparisonPolicy,com.intellij.diff.comparison.CancellationChecker):java.util.List +- s:compareAndSplit(java.lang.CharSequence,java.lang.CharSequence,com.intellij.diff.comparison.ComparisonPolicy,com.intellij.diff.comparison.CancellationChecker):java.util.List +- s:convertIntoDiffFragments(com.intellij.diff.comparison.iterables.DiffIterable):java.util.List +- s:convertIntoMergeWordFragments(java.util.List):java.util.List +- s:getInlineChunks(java.lang.CharSequence):java.util.List +- s:isWordChunk(com.intellij.diff.comparison.ByWordRt$InlineChunk):Z +com.intellij.diff.comparison.ByWordRt$InlineChunk +- a:getOffset1():I +- a:getOffset2():I +c:com.intellij.diff.comparison.ByWordRt$LineBlock +- f:fragments:java.util.List +- f:newlines1:I +- f:newlines2:I +- f:offsets:com.intellij.diff.util.Range +- (java.util.List,com.intellij.diff.util.Range,I,I):V +com.intellij.diff.comparison.CancellationChecker +- sf:Companion:com.intellij.diff.comparison.CancellationChecker$Companion +- sf:EMPTY:com.intellij.diff.comparison.CancellationChecker +- a:checkCanceled():V +f:com.intellij.diff.comparison.CancellationChecker$Companion +f:com.intellij.diff.comparison.ComparisonMergeUtil +- s:buildSimple(com.intellij.diff.comparison.iterables.FairDiffIterable,com.intellij.diff.comparison.iterables.FairDiffIterable,com.intellij.diff.comparison.CancellationChecker):java.util.List +- s:tryResolveConflict(java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence):java.lang.CharSequence +e:com.intellij.diff.comparison.ComparisonPolicy +- java.lang.Enum +- sf:DEFAULT:com.intellij.diff.comparison.ComparisonPolicy +- sf:IGNORE_WHITESPACES:com.intellij.diff.comparison.ComparisonPolicy +- sf:TRIM_WHITESPACES:com.intellij.diff.comparison.ComparisonPolicy +- s:valueOf(java.lang.String):com.intellij.diff.comparison.ComparisonPolicy +- s:values():com.intellij.diff.comparison.ComparisonPolicy[] +f:com.intellij.diff.comparison.ComparisonUtil +- s:equalsTrimWhitespaces(java.lang.CharSequence,java.lang.CharSequence):Z +- s:getUnimportantLineCharCount():I +- s:hashCode(java.lang.CharSequence,com.intellij.diff.comparison.ComparisonPolicy):I +- s:isEqualTexts(java.lang.CharSequence,java.lang.CharSequence,com.intellij.diff.comparison.ComparisonPolicy):Z +- s:isEquals(java.lang.CharSequence,java.lang.CharSequence,com.intellij.diff.comparison.ComparisonPolicy):Z +c:com.intellij.diff.comparison.DiffTooBigException +- com.intellij.openapi.progress.ProcessCanceledException +- ():V +f:com.intellij.diff.comparison.MergeResolveUtil +- sf:INSTANCE:com.intellij.diff.comparison.MergeResolveUtil +- sf:tryGreedyResolve(java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence):java.lang.CharSequence +- sf:tryResolve(java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence):java.lang.CharSequence +f:com.intellij.diff.comparison.MergeResolveUtilKt +f:com.intellij.diff.comparison.TrimUtil +- sf:expand(java.lang.CharSequence,java.lang.CharSequence,I,I,I,I):com.intellij.diff.util.Range +- sf:expand(java.lang.CharSequence,java.lang.CharSequence,com.intellij.diff.util.Range):com.intellij.diff.util.Range +- sf:expand(java.util.List,java.util.List,I,I,I,I):com.intellij.diff.util.Range +- sf:expand(java.util.List,java.util.List,I,I,I,I,kotlin.jvm.functions.Function2):com.intellij.diff.util.Range +- sf:expandBackward(java.lang.CharSequence,java.lang.CharSequence,I,I,I,I):I +- sf:expandBackward(java.util.List,java.util.List,I,I,I,I):I +- sf:expandForward(java.lang.CharSequence,java.lang.CharSequence,I,I,I,I):I +- sf:expandForward(java.util.List,java.util.List,I,I,I,I):I +- sf:expandWhitespaces(java.lang.CharSequence,java.lang.CharSequence,I,I,I,I):com.intellij.diff.util.Range +- sf:expandWhitespaces(java.lang.CharSequence,java.lang.CharSequence,com.intellij.diff.util.Range):com.intellij.diff.util.Range +- sf:expandWhitespaces(java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,I,I,I,I,I,I):com.intellij.diff.util.MergeRange +- sf:expandWhitespaces(java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,com.intellij.diff.util.MergeRange):com.intellij.diff.util.MergeRange +- sf:expandWhitespacesBackward(java.lang.CharSequence,java.lang.CharSequence,I,I,I,I):I +- sf:expandWhitespacesBackward(java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,I,I,I,I,I,I):I +- sf:expandWhitespacesForward(java.lang.CharSequence,java.lang.CharSequence,I,I,I,I):I +- sf:expandWhitespacesForward(java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,I,I,I,I,I,I):I +- sf:isAlpha(I):Z +- sf:isContinuousScript(I):Z +- sf:isEquals(java.lang.CharSequence,java.lang.CharSequence,com.intellij.diff.util.Range):Z +- sf:isEquals(java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,com.intellij.diff.util.MergeRange):Z +- sf:isEqualsIgnoreWhitespaces(java.lang.CharSequence,java.lang.CharSequence,com.intellij.diff.util.Range):Z +- sf:isEqualsIgnoreWhitespaces(java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,com.intellij.diff.util.MergeRange):Z +- sf:isPunctuation(C):Z +- sf:isPunctuation(I):Z +- sf:isWhiteSpaceCodePoint(I):Z +- sf:trim(I,I,java.util.BitSet):com.intellij.util.IntPair +- sf:trim(java.lang.CharSequence,I,I):com.intellij.util.IntPair +- sf:trim(java.lang.CharSequence,java.lang.CharSequence,I,I,I,I):com.intellij.diff.util.Range +- sf:trim(java.lang.CharSequence,java.lang.CharSequence,com.intellij.diff.util.Range):com.intellij.diff.util.Range +- sf:trim(java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,I,I,I,I,I,I):com.intellij.diff.util.MergeRange +- sf:trim(java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,com.intellij.diff.util.MergeRange):com.intellij.diff.util.MergeRange +- sf:trimEnd(java.lang.CharSequence,I,I):I +- sf:trimExpandRange(I,I,I,I,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1):com.intellij.diff.util.Range +- sf:trimExpandText(java.lang.CharSequence,java.lang.CharSequence,I,I,I,I,java.util.BitSet,java.util.BitSet):com.intellij.diff.util.Range +- sf:trimStart(java.lang.CharSequence,I,I):I +com.intellij.diff.comparison.iterables.DiffIterable +- a:changes():java.util.Iterator +- a:getLength1():I +- a:getLength2():I +- iterateChanges():java.lang.Iterable +- iterateUnchanged():java.lang.Iterable +- a:unchanged():java.util.Iterator +f:com.intellij.diff.comparison.iterables.DiffIterableUtil +- s:create(com.intellij.util.diff.Diff$Change,I,I):com.intellij.diff.comparison.iterables.DiffIterable +- s:create(java.util.List,I,I):com.intellij.diff.comparison.iterables.DiffIterable +- s:createFragments(java.util.List,I,I):com.intellij.diff.comparison.iterables.DiffIterable +- s:createUnchanged(java.util.List,I,I):com.intellij.diff.comparison.iterables.DiffIterable +- s:diff(java.util.List,java.util.List,com.intellij.diff.comparison.CancellationChecker):com.intellij.diff.comparison.iterables.FairDiffIterable +- s:diff(I[],I[],com.intellij.diff.comparison.CancellationChecker):com.intellij.diff.comparison.iterables.FairDiffIterable +- s:diff(java.lang.Object[],java.lang.Object[],com.intellij.diff.comparison.CancellationChecker):com.intellij.diff.comparison.iterables.FairDiffIterable +- s:expandedIterable(com.intellij.diff.comparison.iterables.DiffIterable,I,I,I,I):com.intellij.diff.comparison.iterables.DiffIterable +- s:extractDataRanges(java.util.List,java.util.List,com.intellij.diff.comparison.iterables.DiffIterable):java.util.List +- s:fair(com.intellij.diff.comparison.iterables.DiffIterable):com.intellij.diff.comparison.iterables.FairDiffIterable +- s:getRangeDelta(com.intellij.diff.util.Range):I +- s:invert(com.intellij.diff.comparison.iterables.DiffIterable):com.intellij.diff.comparison.iterables.DiffIterable +- s:iterateAll(com.intellij.diff.comparison.iterables.DiffIterable):java.lang.Iterable +- s:setVerifyEnabled(Z):V +- s:verify(com.intellij.diff.comparison.iterables.DiffIterable):V +- s:verifyFair(com.intellij.diff.comparison.iterables.DiffIterable):V +c:com.intellij.diff.comparison.iterables.DiffIterableUtil$ChangeBuilder +- com.intellij.diff.comparison.iterables.DiffIterableUtil$ChangeBuilderBase +- (I,I):V +- p:addChange(I,I,I,I):V +- finish():com.intellij.diff.comparison.iterables.DiffIterable +a:com.intellij.diff.comparison.iterables.DiffIterableUtil$ChangeBuilderBase +- (I,I):V +- pa:addChange(I,I,I,I):V +- p:doFinish():V +- getIndex1():I +- getIndex2():I +- getLength1():I +- getLength2():I +- markEqual(I,I):V +- markEqual(I,I,I):V +- markEqual(I,I,I,I):V +c:com.intellij.diff.comparison.iterables.DiffIterableUtil$ExpandChangeBuilder +- com.intellij.diff.comparison.iterables.DiffIterableUtil$ChangeBuilder +- (java.util.List,java.util.List):V +- p:addChange(I,I,I,I):V +c:com.intellij.diff.comparison.iterables.DiffIterableUtil$LineRangeData +- f:equals:Z +- f:objects1:java.util.List +- f:objects2:java.util.List +- (java.util.List,java.util.List,Z):V +com.intellij.diff.comparison.iterables.FairDiffIterable +- com.intellij.diff.comparison.iterables.DiffIterable +com.intellij.diff.fragments.DiffFragment +- a:getEndOffset1():I +- a:getEndOffset2():I +- a:getStartOffset1():I +- a:getStartOffset2():I +c:com.intellij.diff.fragments.DiffFragmentImpl +- com.intellij.diff.fragments.DiffFragment +- (I,I,I,I):V +- getEndOffset1():I +- getEndOffset2():I +- getStartOffset1():I +- getStartOffset2():I +- toString():java.lang.String +com.intellij.diff.fragments.LineFragment +- com.intellij.diff.fragments.DiffFragment +- a:getEndLine1():I +- a:getEndLine2():I +- a:getInnerFragments():java.util.List +- a:getStartLine1():I +- a:getStartLine2():I +c:com.intellij.diff.fragments.LineFragmentImpl +- com.intellij.diff.fragments.LineFragment +- (I,I,I,I,I,I,I,I):V +- (I,I,I,I,I,I,I,I,java.util.List):V +- (com.intellij.diff.fragments.LineFragment,java.util.List):V +- getEndLine1():I +- getEndLine2():I +- getEndOffset1():I +- getEndOffset2():I +- getInnerFragments():java.util.List +- getStartLine1():I +- getStartLine2():I +- getStartOffset1():I +- getStartOffset2():I +- toString():java.lang.String +com.intellij.diff.fragments.MergeLineFragment +- a:getEndLine(com.intellij.diff.util.ThreeSide):I +- a:getStartLine(com.intellij.diff.util.ThreeSide):I +c:com.intellij.diff.fragments.MergeLineFragmentImpl +- com.intellij.diff.fragments.MergeLineFragment +- (I,I,I,I,I,I):V +- (com.intellij.diff.fragments.MergeLineFragment):V +- (com.intellij.diff.util.MergeRange):V +- getEndLine(com.intellij.diff.util.ThreeSide):I +- getStartLine(com.intellij.diff.util.ThreeSide):I +com.intellij.diff.fragments.MergeWordFragment +- a:getEndOffset(com.intellij.diff.util.ThreeSide):I +- a:getStartOffset(com.intellij.diff.util.ThreeSide):I +c:com.intellij.diff.fragments.MergeWordFragmentImpl +- com.intellij.diff.fragments.MergeWordFragment +- (I,I,I,I,I,I):V +- (com.intellij.diff.util.MergeRange):V +- getEndOffset(com.intellij.diff.util.ThreeSide):I +- getStartOffset(com.intellij.diff.util.ThreeSide):I +com.intellij.diff.tools.util.text.LineOffsets +- a:getLineCount():I +- a:getLineEnd(I):I +- a:getLineEnd(I,Z):I +- a:getLineNumber(I):I +- a:getLineStart(I):I +- a:getTextLength():I +f:com.intellij.diff.tools.util.text.LineOffsetsImpl +- com.intellij.diff.tools.util.text.LineOffsets +- s:create(java.lang.CharSequence):com.intellij.diff.tools.util.text.LineOffsets +- getLineCount():I +- getLineEnd(I):I +- getLineEnd(I,Z):I +- getLineNumber(I):I +- getLineStart(I):I +- getTextLength():I +f:com.intellij.diff.util.DiffRangeUtil +- s:getLines(java.lang.CharSequence,com.intellij.diff.tools.util.text.LineOffsets):java.util.List +- s:getLines(java.lang.CharSequence,com.intellij.diff.tools.util.text.LineOffsets,I,I):java.util.List +- s:getLinesContent(java.lang.CharSequence,com.intellij.diff.tools.util.text.LineOffsets,I,I):java.lang.CharSequence +- s:getLinesContent(java.lang.CharSequence,com.intellij.diff.tools.util.text.LineOffsets,I,I,Z):java.lang.CharSequence +- s:getLinesRange(com.intellij.diff.tools.util.text.LineOffsets,I,I,Z):com.intellij.openapi.util.TextRange +c:com.intellij.diff.util.MergeConflictType +- (com.intellij.diff.util.MergeConflictType$Type,Z,Z):V +- (com.intellij.diff.util.MergeConflictType$Type,Z,Z,Z):V +- canBeResolved():Z +- getType():com.intellij.diff.util.MergeConflictType$Type +- isChange(com.intellij.diff.util.Side):Z +- isChange(com.intellij.diff.util.ThreeSide):Z +e:com.intellij.diff.util.MergeConflictType$Type +- java.lang.Enum +- sf:CONFLICT:com.intellij.diff.util.MergeConflictType$Type +- sf:DELETED:com.intellij.diff.util.MergeConflictType$Type +- sf:INSERTED:com.intellij.diff.util.MergeConflictType$Type +- sf:MODIFIED:com.intellij.diff.util.MergeConflictType$Type +- s:valueOf(java.lang.String):com.intellij.diff.util.MergeConflictType$Type +- s:values():com.intellij.diff.util.MergeConflictType$Type[] +c:com.intellij.diff.util.MergeRange +- f:end1:I +- f:end2:I +- f:end3:I +- f:start1:I +- f:start2:I +- f:start3:I +- (I,I,I,I,I,I):V +- equals(java.lang.Object):Z +- hashCode():I +- isEmpty():Z +- toString():java.lang.String +f:com.intellij.diff.util.MergeRangeUtil +- s:compareWordMergeContents(com.intellij.diff.fragments.MergeWordFragment,java.util.List,com.intellij.diff.comparison.ComparisonPolicy,com.intellij.diff.util.ThreeSide,com.intellij.diff.util.ThreeSide):Z +- s:getLineLeftToRightThreeSideDiffType(com.intellij.diff.fragments.MergeLineFragment,java.util.List,java.util.List,com.intellij.diff.comparison.ComparisonPolicy):com.intellij.diff.util.MergeConflictType +- s:getLineMergeType(com.intellij.diff.fragments.MergeLineFragment,java.util.List,java.util.List,com.intellij.diff.comparison.ComparisonPolicy):com.intellij.diff.util.MergeConflictType +- s:getLineThreeWayDiffType(com.intellij.diff.fragments.MergeLineFragment,java.util.List,java.util.List,com.intellij.diff.comparison.ComparisonPolicy):com.intellij.diff.util.MergeConflictType +- s:getMergeType(java.util.function.Predicate,java.util.function.BiPredicate,java.util.function.BiPredicate,java.util.function.BooleanSupplier):com.intellij.diff.util.MergeConflictType +- s:getWordMergeType(com.intellij.diff.fragments.MergeWordFragment,java.util.List,com.intellij.diff.comparison.ComparisonPolicy):com.intellij.diff.util.MergeConflictType +f:com.intellij.diff.util.Range +- f:end1:I +- f:end2:I +- f:start1:I +- f:start2:I +- (I,I,I,I):V +- equals(java.lang.Object):Z +- hashCode():I +- isEmpty():Z +- toString():java.lang.String +e:com.intellij.diff.util.Side +- java.lang.Enum +- sf:LEFT:com.intellij.diff.util.Side +- sf:RIGHT:com.intellij.diff.util.Side +- s:fromIndex(I):com.intellij.diff.util.Side +- s:fromLeft(Z):com.intellij.diff.util.Side +- s:fromRight(Z):com.intellij.diff.util.Side +- s:fromValue(java.util.List,java.lang.Object):com.intellij.diff.util.Side +- getEndLine(com.intellij.diff.fragments.LineFragment):I +- getEndOffset(com.intellij.diff.fragments.DiffFragment):I +- getIndex():I +- getStartLine(com.intellij.diff.fragments.LineFragment):I +- getStartOffset(com.intellij.diff.fragments.DiffFragment):I +- isLeft():Z +- other():com.intellij.diff.util.Side +- other(Z):com.intellij.diff.util.Side +- select(I,I):I +- select(com.intellij.openapi.util.Couple):java.lang.Object +- select(java.lang.Object,java.lang.Object):java.lang.Object +- select(java.util.List):java.lang.Object +- select(I[]):I +- select(java.lang.Object[]):java.lang.Object +- select(Z[]):Z +- selectNotNull(com.intellij.openapi.util.Couple):java.lang.Object +- selectNotNull(java.lang.Object,java.lang.Object):java.lang.Object +- selectNotNull(java.util.List):java.lang.Object +- selectNotNull(java.lang.Object[]):java.lang.Object +- s:valueOf(java.lang.String):com.intellij.diff.util.Side +- s:values():com.intellij.diff.util.Side[] +e:com.intellij.diff.util.ThreeSide +- java.lang.Enum +- sf:BASE:com.intellij.diff.util.ThreeSide +- sf:LEFT:com.intellij.diff.util.ThreeSide +- sf:RIGHT:com.intellij.diff.util.ThreeSide +- s:fromIndex(I):com.intellij.diff.util.ThreeSide +- s:fromValue(java.util.List,java.lang.Object):com.intellij.diff.util.ThreeSide +- getIndex():I +- s:map(com.intellij.util.Function):java.util.List +- select(I,I,I):I +- select(java.lang.Object,java.lang.Object,java.lang.Object):java.lang.Object +- select(java.util.List):java.lang.Object +- select(I[]):I +- select(java.lang.Object[]):java.lang.Object +- selectNotNull(java.lang.Object,java.lang.Object,java.lang.Object):java.lang.Object +- selectNotNull(java.util.List):java.lang.Object +- selectNotNull(java.lang.Object[]):java.lang.Object +- s:valueOf(java.lang.String):com.intellij.diff.util.ThreeSide +- s:values():com.intellij.diff.util.ThreeSide[] +f:com.intellij.util.diff.Diff +- s:buildChanges(java.lang.CharSequence,java.lang.CharSequence):com.intellij.util.diff.Diff$Change +- s:buildChanges(I[],I[]):com.intellij.util.diff.Diff$Change +- s:buildChanges(java.lang.Object[],java.lang.Object[]):com.intellij.util.diff.Diff$Change +- s:buildChanges(java.lang.Object[],java.lang.Object[],com.intellij.util.containers.HashingStrategy):com.intellij.util.diff.Diff$Change +- s:linesDiff(java.lang.CharSequence[],java.lang.CharSequence[]):java.lang.CharSequence +- s:splitLines(java.lang.CharSequence):java.lang.String[] +- s:translateLine(com.intellij.util.diff.Diff$Change,I):I +- s:translateLine(com.intellij.util.diff.Diff$Change,I,Z):I +- s:translateLine(java.lang.CharSequence,java.lang.CharSequence,I,Z):I +c:com.intellij.util.diff.Diff$Change +- f:deleted:I +- f:inserted:I +- f:line0:I +- f:line1:I +- link:com.intellij.util.diff.Diff$Change +- (I,I,I,I,com.intellij.util.diff.Diff$Change):V +- toList():java.util.ArrayList +- toString():java.lang.String +c:com.intellij.util.diff.Diff$ChangeBuilder +- (I):V +- addChange(I,I):V +- addEqual(I):V +- getFirstChange():com.intellij.util.diff.Diff$Change +c:com.intellij.util.diff.FilesTooBigForDiffException +- java.lang.Exception +- ():V diff --git a/platform/util/diff/src/com/intellij/diff/comparison/ByCharRt.java b/platform/util/diff/src/com/intellij/diff/comparison/ByCharRt.java index 1843e85e95c0..3d3084dd29e5 100644 --- a/platform/util/diff/src/com/intellij/diff/comparison/ByCharRt.java +++ b/platform/util/diff/src/com/intellij/diff/comparison/ByCharRt.java @@ -1,4 +1,4 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.diff.comparison; import com.intellij.diff.comparison.iterables.DiffIterable; @@ -17,6 +17,9 @@ import static com.intellij.diff.comparison.TrimUtil.isWhiteSpaceCodePoint; import static com.intellij.diff.comparison.iterables.DiffIterableUtil.*; public final class ByCharRt { + + private ByCharRt() { } + @NotNull public static FairDiffIterable compare(@NotNull CharSequence text1, @NotNull CharSequence text2, diff --git a/platform/util/diff/src/com/intellij/diff/comparison/ByLineRt.java b/platform/util/diff/src/com/intellij/diff/comparison/ByLineRt.java index acb4a02feac7..aa635b8801ca 100644 --- a/platform/util/diff/src/com/intellij/diff/comparison/ByLineRt.java +++ b/platform/util/diff/src/com/intellij/diff/comparison/ByLineRt.java @@ -1,4 +1,4 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.diff.comparison; import com.intellij.diff.comparison.iterables.FairDiffIterable; @@ -21,6 +21,9 @@ import static com.intellij.diff.comparison.iterables.DiffIterableUtil.*; import static com.intellij.openapi.util.text.Strings.isWhiteSpace; public final class ByLineRt { + + private ByLineRt() { } + @NotNull public static FairDiffIterable compare(@NotNull List lines1, @NotNull List lines2, diff --git a/platform/util/diff/src/com/intellij/diff/comparison/ByWordRt.java b/platform/util/diff/src/com/intellij/diff/comparison/ByWordRt.java index 3c1c3390ac5d..a62df12ba0a7 100644 --- a/platform/util/diff/src/com/intellij/diff/comparison/ByWordRt.java +++ b/platform/util/diff/src/com/intellij/diff/comparison/ByWordRt.java @@ -1,4 +1,4 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.diff.comparison; import com.intellij.diff.comparison.LineFragmentSplitter.WordBlock; @@ -24,6 +24,9 @@ import static com.intellij.diff.comparison.iterables.DiffIterableUtil.*; import static com.intellij.openapi.util.text.Strings.isWhiteSpace; public final class ByWordRt { + + private ByWordRt() { } + @NotNull public static List compare(@NotNull CharSequence text1, @NotNull CharSequence text2, diff --git a/platform/util/diff/src/com/intellij/diff/comparison/ComparisonMergeUtil.java b/platform/util/diff/src/com/intellij/diff/comparison/ComparisonMergeUtil.java index dfa31fbd2628..c585a1aabbba 100644 --- a/platform/util/diff/src/com/intellij/diff/comparison/ComparisonMergeUtil.java +++ b/platform/util/diff/src/com/intellij/diff/comparison/ComparisonMergeUtil.java @@ -1,4 +1,4 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.diff.comparison; import com.intellij.diff.comparison.iterables.FairDiffIterable; @@ -15,6 +15,9 @@ import java.util.ArrayList; import java.util.List; public final class ComparisonMergeUtil { + + private ComparisonMergeUtil() { } + @NotNull public static List buildSimple(@NotNull FairDiffIterable fragments1, @NotNull FairDiffIterable fragments2, @@ -24,10 +27,10 @@ public final class ComparisonMergeUtil { } @NotNull - public static List buildMerge(@NotNull FairDiffIterable fragments1, - @NotNull FairDiffIterable fragments2, - @NotNull SideEquality trueEquality, - @NotNull CancellationChecker indicator) { + static List buildMerge(@NotNull FairDiffIterable fragments1, + @NotNull FairDiffIterable fragments2, + @NotNull SideEquality trueEquality, + @NotNull CancellationChecker indicator) { assert fragments1.getLength1() == fragments2.getLength1(); return new FairMergeBuilder(trueEquality).execute(fragments1, fragments2); } diff --git a/platform/util/diff/src/com/intellij/diff/comparison/ComparisonUtil.java b/platform/util/diff/src/com/intellij/diff/comparison/ComparisonUtil.java index 6e9c376d2eaa..03683aa12e24 100644 --- a/platform/util/diff/src/com/intellij/diff/comparison/ComparisonUtil.java +++ b/platform/util/diff/src/com/intellij/diff/comparison/ComparisonUtil.java @@ -1,4 +1,4 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.diff.comparison; import com.intellij.openapi.util.text.StringUtilRt; @@ -12,6 +12,9 @@ import static com.intellij.diff.comparison.TrimUtil.trimEnd; import static com.intellij.diff.comparison.TrimUtil.trimStart; public final class ComparisonUtil { + + private ComparisonUtil() { } + public static boolean isEquals(@Nullable CharSequence text1, @Nullable CharSequence text2, @NotNull ComparisonPolicy policy) { if (text1 == text2) return true; if (text1 == null || text2 == null) return false; diff --git a/platform/util/diff/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java b/platform/util/diff/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java index 03acee202a76..03c948622497 100644 --- a/platform/util/diff/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java +++ b/platform/util/diff/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.diff.comparison.iterables; import com.intellij.diff.comparison.CancellationChecker; @@ -19,6 +19,9 @@ import java.util.Iterator; import java.util.List; public final class DiffIterableUtil { + + private DiffIterableUtil() { } + @TestOnly private static boolean SHOULD_VERIFY_ITERABLE = false; diff --git a/platform/util/diff/src/com/intellij/diff/comparison/iterables/SubiterableDiffIterable.java b/platform/util/diff/src/com/intellij/diff/comparison/iterables/SubiterableDiffIterable.java index 840e81fccce0..8f4121776f5a 100644 --- a/platform/util/diff/src/com/intellij/diff/comparison/iterables/SubiterableDiffIterable.java +++ b/platform/util/diff/src/com/intellij/diff/comparison/iterables/SubiterableDiffIterable.java @@ -1,11 +1,13 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.diff.comparison.iterables; import com.intellij.diff.util.Range; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; import java.util.List; +@Internal public class SubiterableDiffIterable extends ChangeDiffIterableBase { @NotNull private final List myChanged; private final int myStart1; diff --git a/platform/util/diff/src/com/intellij/diff/util/DiffRangeUtil.java b/platform/util/diff/src/com/intellij/diff/util/DiffRangeUtil.java index 716c4d215d76..ca9d2fea75e1 100644 --- a/platform/util/diff/src/com/intellij/diff/util/DiffRangeUtil.java +++ b/platform/util/diff/src/com/intellij/diff/util/DiffRangeUtil.java @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.diff.util; import com.intellij.diff.tools.util.text.LineOffsets; @@ -10,6 +10,9 @@ import java.util.ArrayList; import java.util.List; public final class DiffRangeUtil { + + private DiffRangeUtil() { } + @NotNull public static CharSequence getLinesContent(@NotNull CharSequence sequence, @NotNull LineOffsets lineOffsets, int line1, int line2) { return getLinesContent(sequence, lineOffsets, line1, line2, false); diff --git a/platform/util/diff/src/com/intellij/diff/util/MergeRangeUtil.java b/platform/util/diff/src/com/intellij/diff/util/MergeRangeUtil.java index 018907cc8d3d..a94cd6e837a2 100644 --- a/platform/util/diff/src/com/intellij/diff/util/MergeRangeUtil.java +++ b/platform/util/diff/src/com/intellij/diff/util/MergeRangeUtil.java @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.diff.util; import com.intellij.diff.comparison.ComparisonMergeUtil; @@ -18,6 +18,9 @@ import java.util.function.Predicate; import static com.intellij.diff.util.DiffRangeUtil.getLinesContent; public final class MergeRangeUtil { + + private MergeRangeUtil() { } + @NotNull public static MergeConflictType getMergeType(@NotNull Predicate emptiness, @NotNull BiPredicate equality, diff --git a/platform/util/diff/src/com/intellij/util/diff/Diff.java b/platform/util/diff/src/com/intellij/util/diff/Diff.java index 691087a4fdcf..0f6ebeefdde5 100644 --- a/platform/util/diff/src/com/intellij/util/diff/Diff.java +++ b/platform/util/diff/src/com/intellij/util/diff/Diff.java @@ -1,4 +1,4 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.util.diff; import com.intellij.openapi.diagnostic.LoggerRt; @@ -15,6 +15,9 @@ import java.util.Arrays; import java.util.BitSet; public final class Diff { + + private Diff() { } + private static final LoggerRt LOG = LoggerRt.getInstance(Diff.class); public static @Nullable Change buildChanges(@NotNull CharSequence before, @NotNull CharSequence after) throws FilesTooBigForDiffException { diff --git a/platform/util/diff/src/com/intellij/util/diff/DiffConfig.java b/platform/util/diff/src/com/intellij/util/diff/DiffConfig.java index 209eff234ed9..cb0e66b2ce71 100644 --- a/platform/util/diff/src/com/intellij/util/diff/DiffConfig.java +++ b/platform/util/diff/src/com/intellij/util/diff/DiffConfig.java @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.util.diff; import com.intellij.util.SystemProperties; @@ -7,6 +7,9 @@ import org.jetbrains.annotations.NonNls; @ApiStatus.Internal public final class DiffConfig { + + private DiffConfig() { } + private static final @NonNls String DIFF_DELTA_THRESHOLD_SIZE_KEY = "idea.diff.delta.threshold.size"; private static final @NonNls String DIFF_DELTA_PATIENCE_ALG_KEY = "idea.diff.force.patience.alg";