diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml new file mode 100644 index 000000000..77f03a929 --- /dev/null +++ b/.github/workflows/typos.yml @@ -0,0 +1,19 @@ +--- +# yamllint disable rule:line-length +name: check_typos + +on: # yamllint disable-line rule:truthy + push: + pull_request: + branches: + - '**' + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: typos-action + uses: crate-ci/typos@v1.29.4 diff --git a/_typos.toml b/_typos.toml new file mode 100644 index 000000000..de320fe31 --- /dev/null +++ b/_typos.toml @@ -0,0 +1,7 @@ +[files] +extend-exclude = ["server/src/test/resources/completions/*.kt"] + +[default.extend-words] +ba = "ba" +vertx = "vertx" +nd = "nd" diff --git a/detekt_baseline.xml b/detekt_baseline.xml index 8988b113f..00332633e 100644 --- a/detekt_baseline.xml +++ b/detekt_baseline.xml @@ -26,7 +26,7 @@ EmptyClassBlock:samefile.kt$MyImplClass${} EmptyClassBlock:samefile.kt$NullClass${} EmptyClassBlock:samefile.kt$PrintableClass${} - EmptyClassBlock:standardlib.kt$MyComperable${} + EmptyClassBlock:standardlib.kt$MyComparable${} EmptyClassBlock:standardlib.kt$MyList${} EmptyClassBlock:standardlib.kt$MyThread${} EmptyDefaultConstructor:BigFile.kt$BigFile.A$() diff --git a/server/src/main/kotlin/org/javacs/kt/compiler/Compiler.kt b/server/src/main/kotlin/org/javacs/kt/compiler/Compiler.kt index 585ee6d8a..d9d6fd191 100644 --- a/server/src/main/kotlin/org/javacs/kt/compiler/Compiler.kt +++ b/server/src/main/kotlin/org/javacs/kt/compiler/Compiler.kt @@ -242,7 +242,7 @@ private class CompilationEnvironment( "org.gradle.api.tasks.testing.*", "org.gradle.api.tasks.testing.junit.*", "org.gradle.api.tasks.testing.junitplatform.*", - "org.gradle.api.tasks.testing.testng.*", + "org.gradle.api.tasks.testing.testing.*", "org.gradle.api.tasks.util.*", "org.gradle.api.tasks.wrapper.*", "org.gradle.authentication.*", diff --git a/server/src/main/kotlin/org/javacs/kt/formatting/Formatter.kt b/server/src/main/kotlin/org/javacs/kt/formatting/Formatter.kt index 901942e0e..84f0f8878 100644 --- a/server/src/main/kotlin/org/javacs/kt/formatting/Formatter.kt +++ b/server/src/main/kotlin/org/javacs/kt/formatting/Formatter.kt @@ -1,8 +1,8 @@ package org.javacs.kt.formatting -import org.eclipse.lsp4j.FormattingOptions as LspFromattingOptions +import org.eclipse.lsp4j.FormattingOptions as LspFormattingOptions interface Formatter { - fun format(code: String, options: LspFromattingOptions): String + fun format(code: String, options: LspFormattingOptions): String } diff --git a/server/src/main/kotlin/org/javacs/kt/formatting/FormattingService.kt b/server/src/main/kotlin/org/javacs/kt/formatting/FormattingService.kt index 97cc16bc9..fd9752045 100644 --- a/server/src/main/kotlin/org/javacs/kt/formatting/FormattingService.kt +++ b/server/src/main/kotlin/org/javacs/kt/formatting/FormattingService.kt @@ -2,7 +2,7 @@ package org.javacs.kt.formatting import org.javacs.kt.Configuration import org.javacs.kt.FormattingConfiguration -import org.eclipse.lsp4j.FormattingOptions as LspFromattingOptions +import org.eclipse.lsp4j.FormattingOptions as LspFormattingOptions private const val DEFAULT_INDENT = 4 @@ -16,6 +16,6 @@ class FormattingService(private val config: FormattingConfiguration) { fun formatKotlinCode( code: String, - options: LspFromattingOptions = LspFromattingOptions(DEFAULT_INDENT, true) + options: LspFormattingOptions = LspFormattingOptions(DEFAULT_INDENT, true) ): String = this.formatter.format(code, options) } diff --git a/server/src/main/kotlin/org/javacs/kt/index/ExtractSymbolVisibility.kt b/server/src/main/kotlin/org/javacs/kt/index/ExtractSymbolVisibility.kt index 17f5d28a8..9e238a787 100644 --- a/server/src/main/kotlin/org/javacs/kt/index/ExtractSymbolVisibility.kt +++ b/server/src/main/kotlin/org/javacs/kt/index/ExtractSymbolVisibility.kt @@ -4,7 +4,7 @@ import org.jetbrains.kotlin.descriptors.* object ExtractSymbolVisibility : DeclarationDescriptorVisitor { private fun convert(visibility: DescriptorVisibility): Symbol.Visibility = when (visibility.delegate) { - Visibilities.PrivateToThis -> Symbol.Visibility.PRIAVTE_TO_THIS + Visibilities.PrivateToThis -> Symbol.Visibility.PRIVATE_TO_THIS Visibilities.Private -> Symbol.Visibility.PRIVATE Visibilities.Internal -> Symbol.Visibility.INTERNAL Visibilities.Protected -> Symbol.Visibility.PROTECTED diff --git a/server/src/main/kotlin/org/javacs/kt/index/Symbol.kt b/server/src/main/kotlin/org/javacs/kt/index/Symbol.kt index ed6c47161..0b185535a 100644 --- a/server/src/main/kotlin/org/javacs/kt/index/Symbol.kt +++ b/server/src/main/kotlin/org/javacs/kt/index/Symbol.kt @@ -27,7 +27,7 @@ data class Symbol( } enum class Visibility(val rawValue: Int) { - PRIAVTE_TO_THIS(0), + PRIVATE_TO_THIS(0), PRIVATE(1), INTERNAL(2), PROTECTED(3), diff --git a/server/src/main/kotlin/org/javacs/kt/inlayhints/InlayHint.kt b/server/src/main/kotlin/org/javacs/kt/inlayhints/InlayHint.kt index 4644a8987..b4143c153 100644 --- a/server/src/main/kotlin/org/javacs/kt/inlayhints/InlayHint.kt +++ b/server/src/main/kotlin/org/javacs/kt/inlayhints/InlayHint.kt @@ -191,7 +191,7 @@ private fun declarationHint( ) { if (!config.typeHints) return - //check decleration does not include type i.e. var t1: String + //check declaration does not include type i.e. var t1: String if (node.typeReference != null) return val hint = node.hintBuilder(InlayKind.TypeHint, file) ?: return diff --git a/server/src/main/kotlin/org/javacs/kt/overridemembers/OverrideMembers.kt b/server/src/main/kotlin/org/javacs/kt/overridemembers/OverrideMembers.kt index e404d94a9..4602eef10 100644 --- a/server/src/main/kotlin/org/javacs/kt/overridemembers/OverrideMembers.kt +++ b/server/src/main/kotlin/org/javacs/kt/overridemembers/OverrideMembers.kt @@ -91,7 +91,7 @@ private fun getUnimplementedMembersStubs(file: CompiledFile, kotlinClass: KtClas .getContributedDescriptors() .filter { classMember -> classMember is MemberDescriptor && - classMember.canBeOverriden() && + classMember.canBeOverridden() && !overridesDeclaration(kotlinClass, classMember) } .mapNotNull { member -> @@ -111,7 +111,7 @@ private fun ClassDescriptor.canBeExtended() = this.kind.isInterface || this.modality == Modality.ABSTRACT || this.modality == Modality.OPEN -private fun MemberDescriptor.canBeOverriden() = (Modality.ABSTRACT == this.modality || Modality.OPEN == this.modality) && Modality.FINAL != this.modality && this.visibility != DescriptorVisibilities.PRIVATE && this.visibility != DescriptorVisibilities.PROTECTED +private fun MemberDescriptor.canBeOverridden() = (Modality.ABSTRACT == this.modality || Modality.OPEN == this.modality) && Modality.FINAL != this.modality && this.visibility != DescriptorVisibilities.PRIVATE && this.visibility != DescriptorVisibilities.PROTECTED // interfaces are ClassDescriptors by default. When calling AbstractClass super methods, we get a ClassConstructorDescriptor fun getClassDescriptor(descriptor: DeclarationDescriptor?): ClassDescriptor? = diff --git a/server/src/test/kotlin/org/javacs/kt/ReferencesTest.kt b/server/src/test/kotlin/org/javacs/kt/ReferencesTest.kt index a4dfc7b75..f2b6f6b9c 100644 --- a/server/src/test/kotlin/org/javacs/kt/ReferencesTest.kt +++ b/server/src/test/kotlin/org/javacs/kt/ReferencesTest.kt @@ -5,7 +5,7 @@ import org.hamcrest.MatcherAssert.assertThat import org.junit.Test class ReferencesTest : SingleFileTestFixture("references", "ReferenceTo.kt") { - @Test fun `find referencs to foo`() { + @Test fun `find references to foo`() { val request = referenceParams(file, 2, 11) val references = languageServer.textDocumentService.references(request).get() val referenceStrs = references?.map { it.toString() } diff --git a/server/src/test/resources/quickfixes/samefile.kt b/server/src/test/resources/quickfixes/samefile.kt index 3d17c623e..49918263c 100644 --- a/server/src/test/resources/quickfixes/samefile.kt +++ b/server/src/test/resources/quickfixes/samefile.kt @@ -26,7 +26,7 @@ class NullClass : NullMethodAndReturn {} abstract class MyAbstract { val otherValToTestAbstractOverride = 1 - + abstract val name: String abstract fun myFun() diff --git a/server/src/test/resources/quickfixes/standardlib.kt b/server/src/test/resources/quickfixes/standardlib.kt index bb5acb08d..371af6bcc 100644 --- a/server/src/test/resources/quickfixes/standardlib.kt +++ b/server/src/test/resources/quickfixes/standardlib.kt @@ -4,6 +4,6 @@ import java.util.Comparator class MyThread : Runnable {} -class MyComperable : Comparator {} +class MyComparable : Comparator {} class MyList : AbstractList() {}