Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KON-385 Remove KoCompanionObject #144

Merged
merged 28 commits into from
May 11, 2023
Merged

KON-385 Remove KoCompanionObject #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
89b075a
remove modifiers from declarations() method
nataliapeterwas May 10, 2023
9eacbf5
add more KoNamedDeclarations for getKoDeclaration method
nataliapeterwas May 10, 2023
24ba7c1
change KoDeclaration to KoNamedDeclaration in declarations()
nataliapeterwas May 10, 2023
6e3f433
update KoDeclarationProviderUtil.getKoDeclarations method
nataliapeterwas May 10, 2023
7944752
update KoDeclarationProviderUtil.getKoDeclarations() method
nataliapeterwas May 10, 2023
d95f6d8
upd Assert methods
nataliapeterwas May 10, 2023
6b445fe
upd test in KoScopeForDeclarationTest to check that declarations() re…
nataliapeterwas May 10, 2023
576473a
upd assert method <- when file has Suppress(testMethod) annotation an…
nataliapeterwas May 10, 2023
2fd7def
add KoScope.annotations() and tests
nataliapeterwas May 10, 2023
d17e018
fix tests after adding new KoScopeTest class
nataliapeterwas May 10, 2023
df333f8
add tests for KoScope.declarations() <- to be sure that this method r…
nataliapeterwas May 10, 2023
de468fe
fix spotless and detekt
nataliapeterwas May 10, 2023
ffea674
add comment and format code
nataliapeterwas May 10, 2023
fa77e1f
rename declarations() for namedDeclarations() and add kDocs to PsiDec…
nataliapeterwas May 10, 2023
e09eba7
add KoScope.declarations() method and test
nataliapeterwas May 10, 2023
5140de3
fix konsist test
nataliapeterwas May 10, 2023
19d7743
fix spotless
nataliapeterwas May 10, 2023
e590e8d
rename kDoc
nataliapeterwas May 10, 2023
2063266
rename containsNamedDeclarations -> containsDeclarations
nataliapeterwas May 10, 2023
77d96cb
add companion property for KoObjectDeclaration
nataliapeterwas May 11, 2023
8903e4d
add extensions for object declaration
nataliapeterwas May 11, 2023
00299c3
Merge branch 'KON-129-KoScope.packages' into KON-132-remove-KoCompani…
nataliapeterwas May 11, 2023
ac73997
fix KoScopeOperatorTest
nataliapeterwas May 11, 2023
51aee47
remove KoCompanionObjectDeclaration
nataliapeterwas May 11, 2023
6220f4a
remove companion objects from tests
nataliapeterwas May 11, 2023
4f2d2b3
Merge branch 'main' into KON-132-remove-KoCompanionObject
nataliapeterwas May 11, 2023
d83cc64
add new extensions
nataliapeterwas May 11, 2023
87c9e62
remove unnecessary extensions
nataliapeterwas May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions ...api/ext/declaration/kocomplexdeclaration/KoComplexDeclarationExtForCompanionObjectTest.kt
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions ...on/kocomplexdeclaration/snippet/forcompanionobject/companion-object-represents-type.kttxt
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions ...ppdev/konsist/api/ext/declaration/kodeclaration/KoDeclarationExtForCompanionObjectTest.kt
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions ...declaration/snippet/forcompanionobject/companion-object-has-two-annotations-of-type.kttxt
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions ...konsist/core/declaration/kocompanionobjectdeclaration/KoCompanionObjectDeclarationTest.kt
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions ...declaration/kocompanionobjectdeclaration/snippet/companion-object-has-declared-name.kttxt
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions ...nappdev/konsist/core/declaration/kocomplexdeclaration/KoComplexDeclarationForClassTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ class KoComplexDeclarationForClassTest {
"SampleClass",
"SampleInterface",
"SampleObject",
"SampleCompanionObject",
)

sut
Expand All @@ -59,7 +58,6 @@ class KoComplexDeclarationForClassTest {
"SampleClass",
"SampleInterface",
"SampleObject",
"SampleCompanionObject",
)

sut
Expand All @@ -83,7 +81,6 @@ class KoComplexDeclarationForClassTest {
"SampleClass",
"SampleInterface",
"SampleObject",
"SampleCompanionObject",
)

sut
Expand All @@ -107,7 +104,6 @@ class KoComplexDeclarationForClassTest {
"SampleClassNestedInsideClass",
"SampleObjectNestedInsideClass",
"SampleInterfaceNestedInsideClass",
"SampleCompanionObjectNestedInsideClass",
"SampleObject",
"SampleClassNestedInsideObject",
"SampleObjectNestedInsideObject",
Expand All @@ -116,7 +112,6 @@ class KoComplexDeclarationForClassTest {
"SampleClassNestedInsideInterface",
"SampleObjectNestedInsideInterface",
"SampleInterfaceNestedInsideInterface",
"SampleCompanionObjectNestedInsideInterface",
)

sut.declarations(includeNested = true, includeLocal = true).toList()
Expand Down
Loading