diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerForWholeFileTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerForWholeFileTest.kt index 35815cbd77d..571c1c0a563 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerForWholeFileTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerForWholeFileTest.kt @@ -20,15 +20,19 @@ abstract class AbstractReferenceShortenerForWholeFileTest : AbstractAnalysisApiB val shortenings = executeOnPooledThreadInReadAction { analyseForTest(file) { - ShortenStrategy.entries.associateWith { option -> - val shorteningsForOption = collectPossibleReferenceShortenings( - file, - file.textRange, - classShortenStrategy = { option }, - callableShortenStrategy = { option } - ) + buildMap { + this += "default settings" to collectPossibleReferenceShortenings(file, file.textRange) - shorteningsForOption + this += ShortenStrategy.entries.associateWith { option -> + val shorteningsForOption = collectPossibleReferenceShortenings( + file, + file.textRange, + classShortenStrategy = { option }, + callableShortenStrategy = { option } + ) + + shorteningsForOption + } } } } diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerTest.kt index d561c2e18ab..a70b5039584 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerTest.kt @@ -29,15 +29,19 @@ abstract class AbstractReferenceShortenerTest : AbstractAnalysisApiBasedSingleMo val shortenings = executeOnPooledThreadInReadAction { analyseForTest(element) { - ShortenStrategy.entries.associateWith { option -> - val shorteningsForOption = collectPossibleReferenceShorteningsInElement( - element, - shortenOptions = ShortenOptions.ALL_ENABLED, - classShortenStrategy = { option }, - callableShortenStrategy = { option } - ) + buildMap { + this += "default settings" to collectPossibleReferenceShorteningsInElement(element) - shorteningsForOption + this += ShortenStrategy.entries.associate { option -> + val shorteningsForOption = collectPossibleReferenceShorteningsInElement( + element, + shortenOptions = ShortenOptions.ALL_ENABLED, + classShortenStrategy = { option }, + callableShortenStrategy = { option } + ) + + option.toString() to shorteningsForOption + } } } } diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/annotaiton.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/annotaiton.txt index 94d2e67313d..dd1952c3e94 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/annotaiton.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/annotaiton.txt @@ -1,4 +1,6 @@ Before shortening: some.SomeAnnotation +with default settings: +[type] some.SomeAnnotation with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] some.SomeAnnotation diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/anonymousFunction_annotation.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/anonymousFunction_annotation.txt index d98598fa69c..2b0a0a9794f 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/anonymousFunction_annotation.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/anonymousFunction_annotation.txt @@ -1,4 +1,6 @@ Before shortening: @dependency.Ann +with default settings: +[type] dependency.Ann with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/anonymousFunction_receiverType.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/anonymousFunction_receiverType.txt index 27ecce329d7..413ba90b7d7 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/anonymousFunction_receiverType.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/anonymousFunction_receiverType.txt @@ -1,4 +1,6 @@ Before shortening: dependency.Type +with default settings: +[type] dependency.Type with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/anonymousFunction_returnType.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/anonymousFunction_returnType.txt index 27ecce329d7..413ba90b7d7 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/anonymousFunction_returnType.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/anonymousFunction_returnType.txt @@ -1,4 +1,6 @@ Before shortening: dependency.Type +with default settings: +[type] dependency.Type with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callInsideScriptExpression.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callInsideScriptExpression.txt index 0ea74cc625d..cc6d7017164 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callInsideScriptExpression.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callInsideScriptExpression.txt @@ -1,4 +1,6 @@ Before shortening: one.A +with default settings: +[qualifier] one.A with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] one.A diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callableFromDefaultImport.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callableFromDefaultImport.txt index 9df827d6f23..6148ed08d5b 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callableFromDefaultImport.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callableFromDefaultImport.txt @@ -1,4 +1,6 @@ Before shortening: kotlin.text.charset("") +with default settings: +[qualifier] kotlin.text.charset("") with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] kotlin.text.charset("") diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callableFromDefaultImport2.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callableFromDefaultImport2.txt index 30d2da89264..a0589b27d43 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callableFromDefaultImport2.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callableFromDefaultImport2.txt @@ -1,4 +1,5 @@ Before shortening: kotlin.text.charset("") +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callableFromExplicitImport.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callableFromExplicitImport.txt index b0d061b6864..51fe87adb4e 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callableFromExplicitImport.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callableFromExplicitImport.txt @@ -1,4 +1,6 @@ Before shortening: dependency.foo() +with default settings: +[qualifier] dependency.foo() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classScopes.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classScopes.txt index 3e515fa295d..cefa96680a2 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classScopes.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classScopes.txt @@ -1,8 +1,10 @@ Before shortening: my.simple.name.SuperClass.check() +with default settings: +[qualifier] my.simple.name.SuperClass with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] my.simple.name.SuperClass with SHORTEN_AND_IMPORT: [qualifier] my.simple.name.SuperClass with SHORTEN_AND_STAR_IMPORT: -[qualifier] my.simple.name.SuperClass \ No newline at end of file +[qualifier] my.simple.name.SuperClass diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classScopes2.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classScopes2.txt index 4ef59b665b1..47fb1604c8a 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classScopes2.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classScopes2.txt @@ -1,4 +1,6 @@ Before shortening: Child.Foo.check() +with default settings: +[qualifier] Child.Foo.check() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] Child.Foo.check() diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classScopes3.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classScopes3.txt index 70aac6dedd5..1c05537177e 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classScopes3.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classScopes3.txt @@ -1,4 +1,6 @@ Before shortening: my.simple.name.ClassFarAway.check() +with default settings: +[qualifier] my.simple.name.ClassFarAway with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] my.simple.name.ClassFarAway diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classType.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classType.txt index 5dde274cc36..bb20e1d7240 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classType.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classType.txt @@ -1,4 +1,6 @@ Before shortening: a.b.c.Outer.Inner::class.java +with default settings: +[qualifier] a.b.c.Outer with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] a.b.c.Outer diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classType2.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classType2.txt index 552a4e3c3e4..3ab58156819 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classType2.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classType2.txt @@ -1,4 +1,6 @@ Before shortening: a.b.c.Outer.Middle.Inner::class.java +with default settings: +[qualifier] a.b.c.Outer.Middle.Inner with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] a.b.c.Outer.Middle.Inner diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classWithWrongNumberOfTypeArguments.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classWithWrongNumberOfTypeArguments.txt index 7a903ef8945..b723d4af99a 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classWithWrongNumberOfTypeArguments.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classWithWrongNumberOfTypeArguments.txt @@ -1,4 +1,6 @@ Before shortening: java.util.SortedSet +with default settings: +[type] java.util.SortedSet with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName.txt index 387f95e1592..a0401747545 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName.txt @@ -1,4 +1,5 @@ Before shortening: a.b.c.Outer.Inner::class.java +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName10.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName10.txt index 997e8afae87..668e8037986 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName10.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName10.txt @@ -1,4 +1,5 @@ Before shortening: java.util.SortedSet +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName11.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName11.txt index ac4a9fd74ed..f3e73c7332a 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName11.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName11.txt @@ -1,4 +1,6 @@ Before shortening: java.util.SortedSet +with default settings: +[qualifier] java.util.SortedSet with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName2.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName2.txt index 2ef84e4a6e4..6a5126dda98 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName2.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName2.txt @@ -1,4 +1,6 @@ Before shortening: a.b.c.Outer.Inner::class.java +with default settings: +[qualifier] a.b.c.Outer.Inner with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] a.b.c.Outer.Inner diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName3.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName3.txt index 2ef84e4a6e4..6a5126dda98 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName3.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName3.txt @@ -1,4 +1,6 @@ Before shortening: a.b.c.Outer.Inner::class.java +with default settings: +[qualifier] a.b.c.Outer.Inner with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] a.b.c.Outer.Inner diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName4.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName4.txt index 70897b9f27c..7a74758179a 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName4.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName4.txt @@ -1,4 +1,6 @@ Before shortening: foo.www.ddd.Check.BBD.Bwd::class.java.annotatedInterfaces.size +with default settings: +[qualifier] foo.www.ddd.Check with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] foo.www.ddd.Check diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName5.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName5.txt index 70897b9f27c..7a74758179a 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName5.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName5.txt @@ -1,4 +1,6 @@ Before shortening: foo.www.ddd.Check.BBD.Bwd::class.java.annotatedInterfaces.size +with default settings: +[qualifier] foo.www.ddd.Check with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] foo.www.ddd.Check diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName6.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName6.txt index 70897b9f27c..7a74758179a 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName6.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName6.txt @@ -1,4 +1,6 @@ Before shortening: foo.www.ddd.Check.BBD.Bwd::class.java.annotatedInterfaces.size +with default settings: +[qualifier] foo.www.ddd.Check with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] foo.www.ddd.Check diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName7.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName7.txt index 70897b9f27c..7a74758179a 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName7.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName7.txt @@ -1,4 +1,6 @@ Before shortening: foo.www.ddd.Check.BBD.Bwd::class.java.annotatedInterfaces.size +with default settings: +[qualifier] foo.www.ddd.Check with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] foo.www.ddd.Check diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName8.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName8.txt index a914b258f86..e3c29f3eaf4 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName8.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName8.txt @@ -1,4 +1,6 @@ Before shortening: foo.www.ddd.Check.BBD.Bwd::class.java.annotatedInterfaces.size +with default settings: +[qualifier] foo.www.ddd.Check.BBD with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] foo.www.ddd.Check.BBD diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName9.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName9.txt index 6790369e93d..f809cb28787 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName9.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/classesWithSameName9.txt @@ -1,4 +1,6 @@ Before shortening: foo.www.ddd.Check.BBD.Bwd::class.java.annotatedInterfaces.size +with default settings: +[qualifier] foo.www.ddd.Check.BBD.Bwd with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] foo.www.ddd.Check.BBD.Bwd diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionClassLiteral.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionClassLiteral.txt index a914b258f86..e3c29f3eaf4 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionClassLiteral.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionClassLiteral.txt @@ -1,4 +1,6 @@ Before shortening: foo.www.ddd.Check.BBD.Bwd::class.java.annotatedInterfaces.size +with default settings: +[qualifier] foo.www.ddd.Check.BBD with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] foo.www.ddd.Check.BBD diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionClassLiteral2.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionClassLiteral2.txt index a914b258f86..e3c29f3eaf4 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionClassLiteral2.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionClassLiteral2.txt @@ -1,4 +1,6 @@ Before shortening: foo.www.ddd.Check.BBD.Bwd::class.java.annotatedInterfaces.size +with default settings: +[qualifier] foo.www.ddd.Check.BBD with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] foo.www.ddd.Check.BBD diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionClassLiteral3.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionClassLiteral3.txt index 4b4ed3fcd82..e36ac373125 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionClassLiteral3.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionClassLiteral3.txt @@ -1,4 +1,6 @@ Before shortening: foo.www.ddd.Check.BBD.Companion::class.java.annotatedInterfaces.size +with default settings: +[qualifier] foo.www.ddd.Check.BBD.Companion with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] foo.www.ddd.Check.BBD.Companion diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionQualifier.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionQualifier.txt index 11525009fe0..89fb2386255 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionQualifier.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionQualifier.txt @@ -1,8 +1,10 @@ Before shortening: a.b.c.Outer.Inner.Companion.foo(1, false, "bar") +with default settings: +[qualifier] a.b.c.Outer with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] a.b.c.Outer with SHORTEN_AND_IMPORT: [qualifier] a.b.c.Outer.Inner.Companion with SHORTEN_AND_STAR_IMPORT: -[qualifier] a.b.c.Outer.Inner.Companion \ No newline at end of file +[qualifier] a.b.c.Outer.Inner.Companion diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionUsedOutOfClass.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionUsedOutOfClass.txt index 6808aa1a678..a085dad8566 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionUsedOutOfClass.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/companionUsedOutOfClass.txt @@ -1,4 +1,6 @@ Before shortening: a.b.c.MyClass.Companion.foo() +with default settings: +[qualifier] a.b.c.MyClass.Companion.foo() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] a.b.c.MyClass diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/constructorParameter.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/constructorParameter.txt index 4a5ea8ba21d..5c738717a8a 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/constructorParameter.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/constructorParameter.txt @@ -1,4 +1,6 @@ Before shortening: dependency.Foo() +with default settings: +[qualifier] dependency.Foo() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/contextReceiver.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/contextReceiver.txt index 5f09124147a..7cc2b774871 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/contextReceiver.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/contextReceiver.txt @@ -1,4 +1,5 @@ Before shortening: a.b.c.foo() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/enumClassCompanionAlreadyImported.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/enumClassCompanionAlreadyImported.txt index 5ce590d2266..9a05b5a5bc8 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/enumClassCompanionAlreadyImported.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/enumClassCompanionAlreadyImported.txt @@ -1,4 +1,6 @@ Before shortening: a.b.c.MyEnum.Companion.foo() +with default settings: +[qualifier] a.b.c.MyEnum.Companion.foo() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] a.b.c.MyEnum.Companion.foo() diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/enumEntryInitUsesCompanion.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/enumEntryInitUsesCompanion.txt index 29ebe0469e7..0a40b013793 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/enumEntryInitUsesCompanion.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/enumEntryInitUsesCompanion.txt @@ -1,7 +1,9 @@ Before shortening: C.K +with default settings: +[qualifier] C.K with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: [qualifier] C.K with SHORTEN_AND_STAR_IMPORT: -[qualifier] C.K \ No newline at end of file +[qualifier] C.K diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/enumEntryInitUsesCompanion2.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/enumEntryInitUsesCompanion2.txt index 2e2daec09f5..e2ca828a55e 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/enumEntryInitUsesCompanion2.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/enumEntryInitUsesCompanion2.txt @@ -1,7 +1,9 @@ Before shortening: C.foo() +with default settings: +[qualifier] C.foo() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: [qualifier] C.foo() with SHORTEN_AND_STAR_IMPORT: -[qualifier] C.foo() \ No newline at end of file +[qualifier] C.foo() diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/extensionFromObject.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/extensionFromObject.txt index e8f84e7fc38..882f7f54ec3 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/extensionFromObject.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/extensionFromObject.txt @@ -1,4 +1,5 @@ Before shortening: str.extFun() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/extensionFunction_objectReceiverWithOtherThisInScope.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/extensionFunction_objectReceiverWithOtherThisInScope.txt index adbdab4c0ed..9ed41a28013 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/extensionFunction_objectReceiverWithOtherThisInScope.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/extensionFunction_objectReceiverWithOtherThisInScope.txt @@ -1,4 +1,5 @@ Before shortening: Bar.extFun() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/extensionProperty_objectReceiverWithOtherThisInScope.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/extensionProperty_objectReceiverWithOtherThisInScope.txt index a49fe73b860..cfa4fbadde0 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/extensionProperty_objectReceiverWithOtherThisInScope.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/extensionProperty_objectReceiverWithOtherThisInScope.txt @@ -1,4 +1,5 @@ Before shortening: Bar.extProperty +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/functionalType_parameterPosition.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/functionalType_parameterPosition.txt index 737efb6d0e0..fdd807f84cd 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/functionalType_parameterPosition.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/functionalType_parameterPosition.txt @@ -1,4 +1,6 @@ Before shortening: dependency.Foo +with default settings: +[type] dependency.Foo with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasAndStarImport.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasAndStarImport.txt index 46cba81f6d2..1a1efa938fa 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasAndStarImport.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasAndStarImport.txt @@ -1,4 +1,6 @@ Before shortening: com.dependency.bar +with default settings: +[qualifier] com.dependency.bar -> bar1 with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] com.dependency.bar -> bar1 diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasForFunction.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasForFunction.txt index 09b5081fa52..b2b13b937c9 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasForFunction.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasForFunction.txt @@ -1,4 +1,6 @@ Before shortening: com.dependency.bar() +with default settings: +[qualifier] com.dependency.bar() -> bar1 with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] com.dependency.bar() -> bar1 diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasForProperty.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasForProperty.txt index 46cba81f6d2..1a1efa938fa 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasForProperty.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasForProperty.txt @@ -1,4 +1,6 @@ Before shortening: com.dependency.bar +with default settings: +[qualifier] com.dependency.bar -> bar1 with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] com.dependency.bar -> bar1 diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasForType.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasForType.txt index 8f5a9ce5c78..d82f2cda2aa 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasForType.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasForType.txt @@ -1,4 +1,6 @@ Before shortening: com.dependency.Bar +with default settings: +[type] com.dependency.Bar -> Bar1 with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] com.dependency.Bar -> Bar1 diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasForTypeQualifier.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasForTypeQualifier.txt index 3b587570f2e..5d55b98ff5f 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasForTypeQualifier.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/importAliasForTypeQualifier.txt @@ -1,4 +1,6 @@ Before shortening: com.dependency.Bar.bar() +with default settings: +[qualifier] com.dependency.Bar -> Bar1 with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] com.dependency.Bar -> Bar1 diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/kdoc.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/kdoc.txt index 61e5c3cb3a9..c0efc8db35a 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/kdoc.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/kdoc.txt @@ -1,4 +1,6 @@ Before shortening: a.b.c.dependency.Foo +with default settings: +[kdoc] a.b.c.dependency.Foo with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [kdoc] a.b.c.dependency.Foo diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/kdocQualifierSelected.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/kdocQualifierSelected.txt index 4110b59efd4..e5c3318139f 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/kdocQualifierSelected.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/kdocQualifierSelected.txt @@ -1,4 +1,6 @@ Before shortening: dependency.Foo +with default settings: +[kdoc] dependency.Foo with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [kdoc] dependency.Foo diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/kdocQualifierSelected_rootIdePrefix.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/kdocQualifierSelected_rootIdePrefix.txt index 91f2d2d55da..2f1f32f71f1 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/kdocQualifierSelected_rootIdePrefix.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/kdocQualifierSelected_rootIdePrefix.txt @@ -1,4 +1,6 @@ Before shortening: _root_ide_package_.dependency.Foo +with default settings: +[kdoc] _root_ide_package_.dependency.Foo with DO_NOT_SHORTEN: [kdoc] _root_ide_package_.dependency with SHORTEN_IF_ALREADY_IMPORTED: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/kdocUnresolved.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/kdocUnresolved.txt index 0e5a13b7965..51f832ed1cb 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/kdocUnresolved.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/kdocUnresolved.txt @@ -1,4 +1,6 @@ Before shortening: dependency.Foo.unresolved +with default settings: +[kdoc] dependency.Foo with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [kdoc] dependency.Foo diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/memberVsCompanionObjectMemberConflict.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/memberVsCompanionObjectMemberConflict.txt index a28388a427e..a8426a4b7e8 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/memberVsCompanionObjectMemberConflict.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/memberVsCompanionObjectMemberConflict.txt @@ -1,4 +1,5 @@ Before shortening: MyClass.prop +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/multipleImport.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/multipleImport.txt index 9cac65eeab0..17a55162e15 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/multipleImport.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/multipleImport.txt @@ -1,4 +1,7 @@ Before shortening: x.y.z.Outer.Inner.VALUE0 > x.y.z.Outer.Inner.VALUE1 +with default settings: +[qualifier] x.y.z.Outer.Inner.VALUE0 +[qualifier] x.y.z.Outer.Inner.VALUE1 with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/multipleImportAlias.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/multipleImportAlias.txt index af96e61ef4e..524097eb4df 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/multipleImportAlias.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/multipleImportAlias.txt @@ -4,6 +4,8 @@ Before shortening: when (a) { 3 -> bar3 else -> com.dependency.bar } +with default settings: +[qualifier] com.dependency.bar -> bar1 with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] com.dependency.bar -> bar1 diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/multipleImportAlias2.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/multipleImportAlias2.txt index 198a23f1545..a8f259079a9 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/multipleImportAlias2.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/multipleImportAlias2.txt @@ -4,6 +4,9 @@ Before shortening: when (a) { 3 -> bar3 else -> com.dependency.bar } +with default settings: +[qualifier] com.dependency.bar -> bar1 +[qualifier] com.dependency.bar -> bar1 with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] com.dependency.bar -> bar1 diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClass.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClass.txt index b1016e6a490..e43bef45f3d 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClass.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClass.txt @@ -1,4 +1,5 @@ Before shortening: Inner.foo(1, false, "bar") +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClass2.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClass2.txt index 41b28e14349..f6c85a5d071 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClass2.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClass2.txt @@ -1,4 +1,5 @@ Before shortening: a.b.c.foo(1, false, "bar") +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClass3.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClass3.txt index 0e1bd58dfa3..9081a8b43b1 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClass3.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClass3.txt @@ -1,4 +1,6 @@ Before shortening: Inner.Companion.foo(1, false, "bar") +with default settings: +[qualifier] Inner.Companion with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] Inner.Companion diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/TypeWithGenericsAsExtensionReceiverType_innerType.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/TypeWithGenericsAsExtensionReceiverType_innerType.txt index 9a71427afd8..cda0b2ac57e 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/TypeWithGenericsAsExtensionReceiverType_innerType.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/TypeWithGenericsAsExtensionReceiverType_innerType.txt @@ -1,4 +1,5 @@ Before shortening: Outer.Inner +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/TypeWithGenericsAsExtensionReceiverType_nestedType.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/TypeWithGenericsAsExtensionReceiverType_nestedType.txt index cea78ad2998..01011fe1764 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/TypeWithGenericsAsExtensionReceiverType_nestedType.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/TypeWithGenericsAsExtensionReceiverType_nestedType.txt @@ -1,4 +1,5 @@ Before shortening: Outer.Nested +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_inside.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_inside.txt index aeb34bf6d74..78105cac32f 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_inside.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_inside.txt @@ -2,6 +2,9 @@ Before shortening: fun usage( first: test.OuterClass.Nested, second: test.OuterClass.NestedObject.Nested, ) {} +with default settings: +[type] test.OuterClass +[type] test.OuterClass.NestedObject.Nested with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] test.OuterClass diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_inside_companion.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_inside_companion.txt index 5b9e9a4dc48..a374298ed6d 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_inside_companion.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_inside_companion.txt @@ -2,6 +2,9 @@ Before shortening: fun usage( first: test.OuterClass.Nested, second: test.OuterClass.Companion.Nested, ) {} +with default settings: +[type] test.OuterClass +[type] test.OuterClass.Companion.Nested with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] test.OuterClass diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_inside_namedCompanion.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_inside_namedCompanion.txt index cfb2ebd1f5a..9f3a50e6f0f 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_inside_namedCompanion.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_inside_namedCompanion.txt @@ -2,6 +2,9 @@ Before shortening: fun usage( first: test.OuterClass.Nested, second: test.OuterClass.NamedCompanion.Nested, ) {} +with default settings: +[type] test.OuterClass +[type] test.OuterClass.NamedCompanion.Nested with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] test.OuterClass diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_outside.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_outside.txt index d974c6f26fb..6678dac467c 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_outside.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_outside.txt @@ -2,6 +2,9 @@ Before shortening: fun usage( first: test.OuterClass.Nested, second: test.OuterClass.NestedObject.Nested, ) {} +with default settings: +[type] test.OuterClass.Nested +[type] test.OuterClass.NestedObject with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] test.OuterClass.Nested diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_outside_companion.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_outside_companion.txt index e59134ec26f..ef3a9023614 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_outside_companion.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_outside_companion.txt @@ -2,6 +2,9 @@ Before shortening: fun usage( first: test.OuterClass.Nested, second: test.OuterClass.Companion.Nested, ) {} +with default settings: +[type] test.OuterClass.Nested +[type] test.OuterClass.Companion with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] test.OuterClass.Nested diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_outside_namedCompanion.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_outside_namedCompanion.txt index dbe73b62007..d8f181b4335 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_outside_namedCompanion.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classAndObjectHaveConflictingNestedClasses_outside_namedCompanion.txt @@ -2,6 +2,9 @@ Before shortening: fun usage( first: test.OuterClass.Nested, second: test.OuterClass.NamedCompanion.Nested, ) {} +with default settings: +[type] test.OuterClass.Nested +[type] test.OuterClass.NamedCompanion with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] test.OuterClass.Nested diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnClass.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnClass.txt index 99590352ea3..5e10eb58315 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnClass.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnClass.txt @@ -1,4 +1,5 @@ Before shortening: @Outer.Ann +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnClass_nested.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnClass_nested.txt index 8309708d818..db7e1cabdb4 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnClass_nested.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnClass_nested.txt @@ -1,4 +1,6 @@ Before shortening: @Outer.Ann +with default settings: +[type] Outer.Ann with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] Outer.Ann diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnConstructor.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnConstructor.txt index 8309708d818..db7e1cabdb4 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnConstructor.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnConstructor.txt @@ -1,4 +1,6 @@ Before shortening: @Outer.Ann +with default settings: +[type] Outer.Ann with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] Outer.Ann diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnConstructor_nested.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnConstructor_nested.txt index 8309708d818..db7e1cabdb4 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnConstructor_nested.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnConstructor_nested.txt @@ -1,4 +1,6 @@ Before shortening: @Outer.Ann +with default settings: +[type] Outer.Ann with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] Outer.Ann diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnParameter.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnParameter.txt index 8309708d818..db7e1cabdb4 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnParameter.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnParameter.txt @@ -1,4 +1,6 @@ Before shortening: @Outer.Ann +with default settings: +[type] Outer.Ann with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] Outer.Ann diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnParameter_nested.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnParameter_nested.txt index 8309708d818..db7e1cabdb4 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnParameter_nested.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/annotationOnParameter_nested.txt @@ -1,4 +1,6 @@ Before shortening: @Outer.Ann +with default settings: +[type] Outer.Ann with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] Outer.Ann diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/constructorParameterVsTopLevelProperty_conflict.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/constructorParameterVsTopLevelProperty_conflict.txt index 6e53b1cdb17..4bba44998bd 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/constructorParameterVsTopLevelProperty_conflict.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/constructorParameterVsTopLevelProperty_conflict.txt @@ -12,6 +12,7 @@ Before shortening: class Foo( test.bigProperty() } } +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/constructorParameterVsTopLevelProperty_noConflict.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/constructorParameterVsTopLevelProperty_noConflict.txt index 5a2c2d1baf0..36c0dce3f1e 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/constructorParameterVsTopLevelProperty_noConflict.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/constructorParameterVsTopLevelProperty_noConflict.txt @@ -10,6 +10,11 @@ Before shortening: class Foo(bigProperty: String) { return test.bigProperty } } +with default settings: +[qualifier] test.bigProperty +[qualifier] test.bigProperty +[qualifier] test.bigProperty +[qualifier] test.bigProperty with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] test.bigProperty diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/contextReceiver.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/contextReceiver.txt index cea78ad2998..01011fe1764 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/contextReceiver.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/contextReceiver.txt @@ -1,4 +1,5 @@ Before shortening: Outer.Nested +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/contextReceiver_nested.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/contextReceiver_nested.txt index 2e417ba1a81..fb555bb6e24 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/contextReceiver_nested.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/contextReceiver_nested.txt @@ -1,4 +1,6 @@ Before shortening: Outer.Nested +with default settings: +[type] Outer.Nested with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] Outer.Nested diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/primaryConstructorParameter.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/primaryConstructorParameter.txt index 37a1ca8b41a..348ed5e46c6 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/primaryConstructorParameter.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/primaryConstructorParameter.txt @@ -1,4 +1,7 @@ Before shortening: val param: Outer.Nested = Outer.Nested() +with default settings: +[type] Outer.Nested +[qualifier] Outer.Nested() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] Outer.Nested diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/primaryConstructorParameter_nested.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/primaryConstructorParameter_nested.txt index 37a1ca8b41a..348ed5e46c6 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/primaryConstructorParameter_nested.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/primaryConstructorParameter_nested.txt @@ -1,4 +1,7 @@ Before shortening: val param: Outer.Nested = Outer.Nested() +with default settings: +[type] Outer.Nested +[qualifier] Outer.Nested() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] Outer.Nested diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superType.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superType.txt index a2fb1f83063..fab532649eb 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superType.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superType.txt @@ -1,4 +1,5 @@ Before shortening: class Foo : Outer.Nested { constructor(): super() } +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructor.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructor.txt index 1f19e2f1305..7f1dd0efc79 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructor.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructor.txt @@ -1,4 +1,5 @@ Before shortening: class Foo : Outer.Nested() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructorArgument.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructorArgument.txt index ff0aa61cffa..ddec60b7f4f 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructorArgument.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructorArgument.txt @@ -1,4 +1,6 @@ Before shortening: Outer.OtherNested() +with default settings: +[qualifier] Outer.OtherNested() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] Outer.OtherNested() diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructorArgument_nested.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructorArgument_nested.txt index ff0aa61cffa..ddec60b7f4f 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructorArgument_nested.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructorArgument_nested.txt @@ -1,4 +1,6 @@ Before shortening: Outer.OtherNested() +with default settings: +[qualifier] Outer.OtherNested() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] Outer.OtherNested() diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructorArgument_nested_objectLiteral.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructorArgument_nested_objectLiteral.txt index ff0aa61cffa..ddec60b7f4f 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructorArgument_nested_objectLiteral.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructorArgument_nested_objectLiteral.txt @@ -1,4 +1,6 @@ Before shortening: Outer.OtherNested() +with default settings: +[qualifier] Outer.OtherNested() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] Outer.OtherNested() diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructorArgument_objectLiteral.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructorArgument_objectLiteral.txt index ff0aa61cffa..ddec60b7f4f 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructorArgument_objectLiteral.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructorArgument_objectLiteral.txt @@ -1,4 +1,6 @@ Before shortening: Outer.OtherNested() +with default settings: +[qualifier] Outer.OtherNested() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] Outer.OtherNested() diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructor_nested.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructor_nested.txt index b623ea2e9d6..0e4609c5b2f 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructor_nested.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructor_nested.txt @@ -1,4 +1,6 @@ Before shortening: class Foo : Outer.Nested() +with default settings: +[type] Outer.Nested with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] Outer.Nested diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructor_nested_objectLiteral.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructor_nested_objectLiteral.txt index ae53c44619e..aca784c329b 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructor_nested_objectLiteral.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructor_nested_objectLiteral.txt @@ -1,4 +1,6 @@ Before shortening: val foo = object : Outer.Nested() {} +with default settings: +[type] Outer.Nested with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] Outer.Nested diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructor_objectLiteral.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructor_objectLiteral.txt index 096729905da..bd0b2e3a1f1 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructor_objectLiteral.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeConstructor_objectLiteral.txt @@ -1,4 +1,5 @@ Before shortening: val foo = object : Outer.Nested() {} +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeDelegation.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeDelegation.txt index 85e44222f72..0c55a9ca217 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeDelegation.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeDelegation.txt @@ -1,4 +1,6 @@ Before shortening: Outer.Marker by Outer.MarkerImpl() +with default settings: +[qualifier] Outer.MarkerImpl() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] Outer.MarkerImpl() diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeDelegation_nested.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeDelegation_nested.txt index 01584ef6e15..9da5ded85d1 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeDelegation_nested.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeDelegation_nested.txt @@ -1,4 +1,7 @@ Before shortening: Outer.Marker by Outer.MarkerImpl() +with default settings: +[type] Outer.Marker +[qualifier] Outer.MarkerImpl() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] Outer.Marker diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeTypeArguments.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeTypeArguments.txt index e83bd4d747b..6625fca18ff 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeTypeArguments.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeTypeArguments.txt @@ -1,4 +1,5 @@ Before shortening: Outer.Nested +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeTypeArguments_nested.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeTypeArguments_nested.txt index 2aa2e0c9805..e406ce7bddc 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeTypeArguments_nested.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superTypeTypeArguments_nested.txt @@ -1,4 +1,7 @@ Before shortening: Outer.Nested +with default settings: +[type] Outer.Nested +[type] Outer.OtherNested with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] Outer.Nested diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superType_nested.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superType_nested.txt index 8d0aa0583ee..e672dddb044 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superType_nested.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/superType_nested.txt @@ -1,4 +1,6 @@ Before shortening: class Foo : Outer.Nested { constructor(): super() } +with default settings: +[type] Outer.Nested with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] Outer.Nested diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/typeBound.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/typeBound.txt index cea78ad2998..01011fe1764 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/typeBound.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/typeBound.txt @@ -1,4 +1,5 @@ Before shortening: Outer.Nested +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/typeBound_nested.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/typeBound_nested.txt index 2e417ba1a81..fb555bb6e24 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/typeBound_nested.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/typeBound_nested.txt @@ -1,4 +1,6 @@ Before shortening: Outer.Nested +with default settings: +[type] Outer.Nested with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] Outer.Nested diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/typeBound_whereClause.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/typeBound_whereClause.txt index cea78ad2998..01011fe1764 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/typeBound_whereClause.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/classHeaderPositions/typeBound_whereClause.txt @@ -1,4 +1,5 @@ Before shortening: Outer.Nested +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes1.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes1.txt index 75e85c4b526..8fa0c66aeea 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes1.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes1.txt @@ -1,4 +1,5 @@ Before shortening: val prop: MyInterface.Nested = MyInterface.Nested() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes1_java.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes1_java.txt index 6f24c15fb43..451303879d0 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes1_java.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes1_java.txt @@ -1,4 +1,5 @@ Before shortening: val prop: JavaInterface.Nested = JavaInterface.Nested() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes2.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes2.txt index d852fea443e..6d0d8ddaccd 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes2.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes2.txt @@ -1,4 +1,7 @@ Before shortening: val prop: MyInterface.Nested = MyInterface.Nested() +with default settings: +[type] MyInterface.Nested +[qualifier] MyInterface.Nested() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] MyInterface.Nested diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes2_java.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes2_java.txt index 58949e56f10..cc8b91d5b31 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes2_java.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes2_java.txt @@ -1,4 +1,7 @@ Before shortening: val prop: JavaInterface.Nested = JavaInterface.Nested() +with default settings: +[type] JavaInterface.Nested +[qualifier] JavaInterface.Nested() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] JavaInterface.Nested diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes3.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes3.txt index 6c1430ef188..2ec9ab03eb4 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes3.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes3.txt @@ -1,4 +1,7 @@ Before shortening: val prop: MyBaseClass.Nested = MyBaseClass.Nested() +with default settings: +[type] MyBaseClass.Nested +[qualifier] MyBaseClass.Nested() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] MyBaseClass.Nested diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes3_java.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes3_java.txt index 8068781e282..e2f0f6f4e81 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes3_java.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes3_java.txt @@ -1,4 +1,7 @@ Before shortening: val prop: JavaBaseClass.Nested = JavaBaseClass.Nested() +with default settings: +[type] JavaBaseClass.Nested +[qualifier] JavaBaseClass.Nested() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] JavaBaseClass.Nested diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes4.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes4.txt index 3d4f1bf538c..f82256463d1 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes4.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes4.txt @@ -1,4 +1,7 @@ Before shortening: val prop: MyInterface.Nested get() = MyInterface.Nested() +with default settings: +[type] MyInterface.Nested +[qualifier] MyInterface.Nested() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] MyInterface.Nested diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes5.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes5.txt index 75e85c4b526..8fa0c66aeea 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes5.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes5.txt @@ -1,4 +1,5 @@ Before shortening: val prop: MyInterface.Nested = MyInterface.Nested() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes5_java.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes5_java.txt index 6f24c15fb43..451303879d0 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes5_java.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes5_java.txt @@ -1,4 +1,5 @@ Before shortening: val prop: JavaInterface.Nested = JavaInterface.Nested() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes6.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes6.txt index 6e35eb2a1f4..40f3f1387af 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes6.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes6.txt @@ -1,4 +1,5 @@ Before shortening: val prop: MyBaseClass.Nested = MyBaseClass.Nested() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes6_java.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes6_java.txt index 68f90191280..1c9b1c082c0 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes6_java.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes6_java.txt @@ -1,4 +1,5 @@ Before shortening: val prop: JavaBaseClass.Nested = JavaBaseClass.Nested() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/objectWithInvokeOperator.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/objectWithInvokeOperator.txt index 4a5ea8ba21d..5c738717a8a 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/objectWithInvokeOperator.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/objectWithInvokeOperator.txt @@ -1,4 +1,6 @@ Before shortening: dependency.Foo() +with default settings: +[qualifier] dependency.Foo() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/parameterTypeTopLevelTypeLoses.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/parameterTypeTopLevelTypeLoses.txt index a95d82afdd6..c44b6e4616d 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/parameterTypeTopLevelTypeLoses.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/parameterTypeTopLevelTypeLoses.txt @@ -1,4 +1,5 @@ Before shortening: test.T +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedQualifiedCall1.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedQualifiedCall1.txt index fe73dd48498..82f9f2a0e59 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedQualifiedCall1.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedQualifiedCall1.txt @@ -1,4 +1,5 @@ Before shortening: dependency +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedQualifiedCall2.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedQualifiedCall2.txt index c464790825d..a53eaa4cacf 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedQualifiedCall2.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedQualifiedCall2.txt @@ -1,4 +1,6 @@ Before shortening: foo() +with default settings: +[qualifier] dependency.foo() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedQualifiedCall3.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedQualifiedCall3.txt index fe73dd48498..82f9f2a0e59 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedQualifiedCall3.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedQualifiedCall3.txt @@ -1,4 +1,5 @@ Before shortening: dependency +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedQualifiedCall4.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedQualifiedCall4.txt index 540c1e65a43..649d7e4c149 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedQualifiedCall4.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedQualifiedCall4.txt @@ -1,4 +1,6 @@ Before shortening: foo +with default settings: +[qualifier] dependency.foo with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedType1.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedType1.txt index fe73dd48498..82f9f2a0e59 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedType1.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedType1.txt @@ -1,4 +1,5 @@ Before shortening: dependency +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedType2.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedType2.txt index 2f1bf6bad06..5103d2609af 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedType2.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedType2.txt @@ -1,4 +1,6 @@ Before shortening: Foo +with default settings: +[type] dependency.Foo with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedTypeQualifier1.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedTypeQualifier1.txt index 2373886ed3a..82f9f2a0e59 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedTypeQualifier1.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedTypeQualifier1.txt @@ -1,5 +1,6 @@ Before shortening: dependency +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: -with SHORTEN_AND_STAR_IMPORT: \ No newline at end of file +with SHORTEN_AND_STAR_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedTypeQualifier2.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedTypeQualifier2.txt index 2a58491df5a..c0d7b282413 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedTypeQualifier2.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/partiallySelectedTypeQualifier2.txt @@ -1,4 +1,6 @@ Before shortening: Foo +with default settings: +[qualifier] dependency.Foo with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/qualifierOfUnresolvedReference.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/qualifierOfUnresolvedReference.txt index fbe7e965a9e..d178a7e495f 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/qualifierOfUnresolvedReference.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/qualifierOfUnresolvedReference.txt @@ -1,4 +1,6 @@ Before shortening: a.b.c.A.f +with default settings: +[type] a.b.c.A with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/receiver.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/receiver.txt index 6767bb8384f..bcf5ca0bbfc 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/receiver.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/receiver.txt @@ -1,4 +1,5 @@ Before shortening: Receiver.foo(1, false, "bar") +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/receiver4.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/receiver4.txt index 41b28e14349..f6c85a5d071 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/receiver4.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/receiver4.txt @@ -1,4 +1,5 @@ Before shortening: a.b.c.foo(1, false, "bar") +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/referenceInNestedClass.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/referenceInNestedClass.txt index e77c0373736..fad53f3ba05 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/referenceInNestedClass.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/referenceInNestedClass.txt @@ -1,4 +1,6 @@ Before shortening: a.b.c.Outer.Inner.Companion.foo() +with default settings: +[qualifier] a.b.c.Outer.Inner with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] a.b.c.Outer.Inner diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/sameNameDifferentParams.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/sameNameDifferentParams.txt index 2fe6aacbe68..17bc90db206 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/sameNameDifferentParams.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/sameNameDifferentParams.txt @@ -1,4 +1,5 @@ Before shortening: foo() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/sameNameDifferentReceiver.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/sameNameDifferentReceiver.txt index 73e1f24ec19..414b98c7b40 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/sameNameDifferentReceiver.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/sameNameDifferentReceiver.txt @@ -1,6 +1,10 @@ Before shortening: foo.myRun { 42 } +with default settings: +[qualifier] foo.myRun { + 42 + } with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/sameTypeNamesWithinSameScopes.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/sameTypeNamesWithinSameScopes.txt index ffeaa6a4149..a1165d40da5 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/sameTypeNamesWithinSameScopes.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/sameTypeNamesWithinSameScopes.txt @@ -1,4 +1,5 @@ Before shortening: fun foo(p1: dependency1.T, p2: dependency2.T) {} +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/selfPropertyChain.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/selfPropertyChain.txt index d46b1545802..26dc6f7a56b 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/selfPropertyChain.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/selfPropertyChain.txt @@ -2,6 +2,7 @@ Before shortening: fun check() { self.self selfFun().self } +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/selfPropertyChain1.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/selfPropertyChain1.txt index d46b1545802..26dc6f7a56b 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/selfPropertyChain1.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/selfPropertyChain1.txt @@ -2,6 +2,7 @@ Before shortening: fun check() { self.self selfFun().self } +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedClass.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedClass.txt index 2c8872a894e..483875ab3f9 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedClass.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedClass.txt @@ -1,4 +1,6 @@ Before shortening: dependency.T(3) +with default settings: +[qualifier] dependency.T(3) with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] dependency.T(3) diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedClass2.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedClass2.txt index 97102dad68f..9c9edd9febd 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedClass2.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedClass2.txt @@ -1,4 +1,6 @@ Before shortening: dependency.T::class.java +with default settings: +[qualifier] dependency.T with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] dependency.T diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedFunction.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedFunction.txt index 5f09124147a..7cc2b774871 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedFunction.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedFunction.txt @@ -1,4 +1,5 @@ Before shortening: a.b.c.foo() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedFunction2.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedFunction2.txt index a216ed179be..4c6a1c9e093 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedFunction2.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedFunction2.txt @@ -1,4 +1,6 @@ Before shortening: Outer.Inner.foo() +with default settings: +[qualifier] Outer.Inner.foo() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] Outer.Inner.foo() diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedFunction3.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedFunction3.txt index b98b8584a31..4bcfbf6a47b 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedFunction3.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedFunction3.txt @@ -1,4 +1,6 @@ Before shortening: Outer.Inner.foo() +with default settings: +[qualifier] Outer.Inner with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] Outer.Inner diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedFunction4.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedFunction4.txt index d532c32cccb..1b26933cefc 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedFunction4.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/shortenAlreadyImportedFunction4.txt @@ -1,4 +1,6 @@ Before shortening: Base.foo() +with default settings: +[qualifier] Base.foo() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] Base.foo() diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/starImport.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/starImport.txt index 5fc57b4fff8..8a20ea41b13 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/starImport.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/starImport.txt @@ -1,4 +1,6 @@ Before shortening: com.dependency.bar() +with default settings: +[qualifier] com.dependency.bar() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] com.dependency.bar() diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/staticMethodFromBaseClassConflict.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/staticMethodFromBaseClassConflict.txt index 9ab993a083f..772f4cc66b5 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/staticMethodFromBaseClassConflict.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/staticMethodFromBaseClassConflict.txt @@ -2,6 +2,8 @@ Before shortening: fun usage() { Middle.test() Base.test() } +with default settings: +[qualifier] Middle.test() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] Middle.test() diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/superClass.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/superClass.txt index ef78548eab9..6c2718e9433 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/superClass.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/superClass.txt @@ -1,5 +1,6 @@ Before shortening: my.simple.name.one() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: -with SHORTEN_AND_STAR_IMPORT: \ No newline at end of file +with SHORTEN_AND_STAR_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/superEntry.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/superEntry.txt index a705db7d3f3..0a14f1b4584 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/superEntry.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/superEntry.txt @@ -1,4 +1,6 @@ Before shortening: foo.bar.A +with default settings: +[type] foo.bar.A with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] foo.bar.A diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_extensionFunction_fromExtensionFunction.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_extensionFunction_fromExtensionFunction.txt index 6f432647ff5..4dd449e0126 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_extensionFunction_fromExtensionFunction.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_extensionFunction_fromExtensionFunction.txt @@ -1,4 +1,5 @@ Before shortening: this.one() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] this.one() diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_extensionFunction_fromExtensionFunction_conflictWithLocal.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_extensionFunction_fromExtensionFunction_conflictWithLocal.txt index 70bd352fbb8..711a8410443 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_extensionFunction_fromExtensionFunction_conflictWithLocal.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_extensionFunction_fromExtensionFunction_conflictWithLocal.txt @@ -1,4 +1,5 @@ Before shortening: this.one() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberFunction_fromMemberFunction.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberFunction_fromMemberFunction.txt index 6f432647ff5..4dd449e0126 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberFunction_fromMemberFunction.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberFunction_fromMemberFunction.txt @@ -1,4 +1,5 @@ Before shortening: this.one() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] this.one() diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberFunction_fromMemberFunction_conflictWithLocal.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberFunction_fromMemberFunction_conflictWithLocal.txt index 70bd352fbb8..711a8410443 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberFunction_fromMemberFunction_conflictWithLocal.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberFunction_fromMemberFunction_conflictWithLocal.txt @@ -1,4 +1,5 @@ Before shortening: this.one() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromInit.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromInit.txt index b234471393f..1e3a2697d19 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromInit.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromInit.txt @@ -1,4 +1,5 @@ Before shortening: this.one +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] this.one diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromInit_conflictWithParameter.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromInit_conflictWithParameter.txt index 1299a1d7d1a..f9e1aeeb60d 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromInit_conflictWithParameter.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromInit_conflictWithParameter.txt @@ -1,4 +1,5 @@ Before shortening: this.one +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunction.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunction.txt index b234471393f..1e3a2697d19 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunction.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunction.txt @@ -1,4 +1,5 @@ Before shortening: this.one +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] this.one diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunctionWithContextReceiver.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunctionWithContextReceiver.txt index b234471393f..1e3a2697d19 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunctionWithContextReceiver.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunctionWithContextReceiver.txt @@ -1,4 +1,5 @@ Before shortening: this.one +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] this.one diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunction_conflictWithLocal.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunction_conflictWithLocal.txt index 1299a1d7d1a..f9e1aeeb60d 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunction_conflictWithLocal.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunction_conflictWithLocal.txt @@ -1,4 +1,5 @@ Before shortening: this.one +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunction_conflictWithParameter.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunction_conflictWithParameter.txt index 1299a1d7d1a..f9e1aeeb60d 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunction_conflictWithParameter.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunction_conflictWithParameter.txt @@ -1,4 +1,5 @@ Before shortening: this.one +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunction_noConflictWithLocal.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunction_noConflictWithLocal.txt index b234471393f..1e3a2697d19 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunction_noConflictWithLocal.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_memberProperty_fromMemberFunction_noConflictWithLocal.txt @@ -1,4 +1,5 @@ Before shortening: this.one +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] this.one diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_nullableReceiver.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_nullableReceiver.txt index 6f432647ff5..4dd449e0126 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_nullableReceiver.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_nullableReceiver.txt @@ -1,4 +1,5 @@ Before shortening: this.one() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] this.one() diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_safeCall.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_safeCall.txt index 43cf983b23b..aa5a276ffbf 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_safeCall.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/this_safeCall.txt @@ -1,4 +1,5 @@ Before shortening: this?.one() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/extensionReceiver.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/extensionReceiver.txt index a9934d96844..e88ed97cd93 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/extensionReceiver.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/extensionReceiver.txt @@ -1,4 +1,5 @@ Before shortening: this@usage.one() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] this@usage.one() diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/extensionReceiver_vs_lambdaReceiver.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/extensionReceiver_vs_lambdaReceiver.txt index ccc1ecd0951..9a5aa064a79 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/extensionReceiver_vs_lambdaReceiver.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/extensionReceiver_vs_lambdaReceiver.txt @@ -1,4 +1,5 @@ Before shortening: this@usage.one() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/extensionReceiver_vs_local.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/extensionReceiver_vs_local.txt index ccc1ecd0951..9a5aa064a79 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/extensionReceiver_vs_local.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/extensionReceiver_vs_local.txt @@ -1,4 +1,5 @@ Before shortening: this@usage.one() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/lambdaReceiver.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/lambdaReceiver.txt index 9a5ab7f0020..1fbd163ef08 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/lambdaReceiver.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/lambdaReceiver.txt @@ -1,4 +1,5 @@ Before shortening: this@test.one() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] this@test.one() diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/lambdaReceiver_vs_lambdaReceiver.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/lambdaReceiver_vs_lambdaReceiver.txt index 54ffedac5e8..f79e9f35a44 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/lambdaReceiver_vs_lambdaReceiver.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/lambdaReceiver_vs_lambdaReceiver.txt @@ -1,4 +1,5 @@ Before shortening: this@test.one() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/regularClass.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/regularClass.txt index efe30cde173..85887a20003 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/regularClass.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/regularClass.txt @@ -1,4 +1,5 @@ Before shortening: this@Regular.one() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] this@Regular.one() diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/regularClass_vs_extensionReceiver.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/regularClass_vs_extensionReceiver.txt index aa9a03fa713..1790fdedacb 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/regularClass_vs_extensionReceiver.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/regularClass_vs_extensionReceiver.txt @@ -1,4 +1,5 @@ Before shortening: this@Regular.one() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/regularClass_vs_innerClass.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/regularClass_vs_innerClass.txt index aa9a03fa713..1790fdedacb 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/regularClass_vs_innerClass.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/thisReference/withLabel/regularClass_vs_innerClass.txt @@ -1,4 +1,5 @@ Before shortening: this@Regular.one() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeArgument.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeArgument.txt index 737efb6d0e0..fdd807f84cd 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeArgument.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeArgument.txt @@ -1,4 +1,6 @@ Before shortening: dependency.Foo +with default settings: +[type] dependency.Foo with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParameters/functionTypeParameterVsType.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParameters/functionTypeParameterVsType.txt index c1c6a0d92d6..4cc8d9ecbeb 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParameters/functionTypeParameterVsType.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParameters/functionTypeParameterVsType.txt @@ -2,6 +2,7 @@ Before shortening: context(test.MyType) fun test.MyType.test(p: test.MyType) { val a: test.MyType } +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParameters/typeParameterVsNestedType.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParameters/typeParameterVsNestedType.txt index 6aab3973618..ee0844b96b1 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParameters/typeParameterVsNestedType.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParameters/typeParameterVsNestedType.txt @@ -1,5 +1,9 @@ Before shortening: context(MyClass.MyType) class Nested : Base() +with default settings: +[type] MyClass.MyType +[type] MyClass.MyType +[type] MyClass.MyType with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] MyClass.MyType diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParameters/typeParameterVsType_conflict.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParameters/typeParameterVsType_conflict.txt index 5bea1c447fe..d0a372ad97f 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParameters/typeParameterVsType_conflict.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParameters/typeParameterVsType_conflict.txt @@ -1,5 +1,6 @@ Before shortening: context(test.MyType) class MyClass : Base() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParameters/typeParameterVsType_noConflict.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParameters/typeParameterVsType_noConflict.txt index 6e5e8d6050e..24102bd0f98 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParameters/typeParameterVsType_noConflict.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParameters/typeParameterVsType_noConflict.txt @@ -1,5 +1,6 @@ Before shortening: context(test.MyType) class Nested : Base() +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParams.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParams.txt index dc7027644ab..30b27842112 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParams.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParams.txt @@ -1,4 +1,5 @@ Before shortening: a.b.c.foo(1, 2) +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParams2.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParams2.txt index 01f5394897e..533d33d148a 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParams2.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/typeParams2.txt @@ -1,5 +1,6 @@ Before shortening: foo(1, 2) +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: -with SHORTEN_AND_STAR_IMPORT: \ No newline at end of file +with SHORTEN_AND_STAR_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/vararg.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/vararg.txt index 737efb6d0e0..fdd807f84cd 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/vararg.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/vararg.txt @@ -1,4 +1,6 @@ Before shortening: dependency.Foo +with default settings: +[type] dependency.Foo with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variable.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variable.txt index 776d7912112..abf80c838ee 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variable.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variable.txt @@ -1,4 +1,5 @@ Before shortening: Receiver.foo +with default settings: with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variable2.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variable2.txt index 0053082cbb1..cc38a26fb6d 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variable2.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variable2.txt @@ -1,4 +1,6 @@ Before shortening: Receiver.foo +with default settings: +[qualifier] Receiver.foo with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] Receiver.foo diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variableAssignment.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variableAssignment.txt index 3bdee8c2315..d672c03a77b 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variableAssignment.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variableAssignment.txt @@ -1,4 +1,6 @@ Before shortening: dependency.foo = 20 +with default settings: +[qualifier] dependency.foo with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variableAssignment_plusAssignOperator.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variableAssignment_plusAssignOperator.txt index b0e2074d4da..864e8052016 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variableAssignment_plusAssignOperator.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variableAssignment_plusAssignOperator.txt @@ -1,4 +1,6 @@ Before shortening: dependency.foo += 20 +with default settings: +[qualifier] dependency.foo with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variableAssignment_plusOperator.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variableAssignment_plusOperator.txt index b0e2074d4da..864e8052016 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variableAssignment_plusOperator.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variableAssignment_plusOperator.txt @@ -1,4 +1,6 @@ Before shortening: dependency.foo += 20 +with default settings: +[qualifier] dependency.foo with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variable_invokeOperator.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variable_invokeOperator.txt index 335b781dc3e..0cb8e27df9a 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variable_invokeOperator.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/variable_invokeOperator.txt @@ -1,4 +1,6 @@ Before shortening: dependency.foo() +with default settings: +[qualifier] dependency.foo() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/callInsideScriptExpression.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/callInsideScriptExpression.txt index ba235b68560..22faa3fe6b5 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/callInsideScriptExpression.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/callInsideScriptExpression.txt @@ -1,3 +1,6 @@ +with default settings: +[qualifier] one.A +[qualifier] one.B with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [qualifier] one.A diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/fileWithKDoc.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/fileWithKDoc.txt index 6e8e76c4a03..e6b74460983 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/fileWithKDoc.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/fileWithKDoc.txt @@ -1,3 +1,7 @@ +with default settings: +[type] a.b.c.dependency.Foo +[kdoc] a.b.c.dependency.Foo +[kdoc] a.b.c.dependency.Foo with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: with SHORTEN_AND_IMPORT: diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/fileWithMultipleDeclarations.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/fileWithMultipleDeclarations.txt index 5cbe8d2434e..34025478fb9 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/fileWithMultipleDeclarations.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/fileWithMultipleDeclarations.txt @@ -1,3 +1,6 @@ +with default settings: +[type] A.B +[qualifier] C.D.Companion.foo() with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] A.B diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/scriptFileWithImportStatement.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/scriptFileWithImportStatement.txt index c13cfb9d372..cd42708849c 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/scriptFileWithImportStatement.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/scriptFileWithImportStatement.txt @@ -1,3 +1,5 @@ +with default settings: +[type] a.b.c.dependency.Foo.Nested with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] a.b.c.dependency.Foo.Nested diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/scriptFileWithoutImportStatements.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/scriptFileWithoutImportStatements.txt index c00c69495d5..1f38b057881 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/scriptFileWithoutImportStatements.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenWholeFile/scriptFileWithoutImportStatements.txt @@ -1,3 +1,5 @@ +with default settings: +[type] a.b.c.dependency.Foo with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: [type] a.b.c.dependency.Foo