Skip to content

Commit 559349d

Browse files
committed
feat: add typos ci
1 parent 8418fb5 commit 559349d

File tree

13 files changed

+40
-14
lines changed

13 files changed

+40
-14
lines changed

.github/workflows/typos.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
# yamllint disable rule:line-length
3+
name: check_typos
4+
5+
on: # yamllint disable-line rule:truthy
6+
push:
7+
pull_request:
8+
branches:
9+
- '**'
10+
11+
jobs:
12+
build:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@v4
17+
18+
- name: typos-action
19+
uses: crate-ci/[email protected]

_typos.toml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[files]
2+
extend-exclude = ["server/src/test/resources/completions/*.kt"]
3+
4+
[default.extend-words]
5+
ba = "ba"
6+
vertx = "vertx"
7+
nd = "nd"

detekt_baseline.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<ID>EmptyClassBlock:samefile.kt$MyImplClass${}</ID>
2727
<ID>EmptyClassBlock:samefile.kt$NullClass${}</ID>
2828
<ID>EmptyClassBlock:samefile.kt$PrintableClass${}</ID>
29-
<ID>EmptyClassBlock:standardlib.kt$MyComperable${}</ID>
29+
<ID>EmptyClassBlock:standardlib.kt$MyComparable${}</ID>
3030
<ID>EmptyClassBlock:standardlib.kt$MyList${}</ID>
3131
<ID>EmptyClassBlock:standardlib.kt$MyThread${}</ID>
3232
<ID>EmptyDefaultConstructor:BigFile.kt$BigFile.A$()</ID>

server/src/main/kotlin/org/javacs/kt/compiler/Compiler.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ private class CompilationEnvironment(
242242
"org.gradle.api.tasks.testing.*",
243243
"org.gradle.api.tasks.testing.junit.*",
244244
"org.gradle.api.tasks.testing.junitplatform.*",
245-
"org.gradle.api.tasks.testing.testng.*",
245+
"org.gradle.api.tasks.testing.testing.*",
246246
"org.gradle.api.tasks.util.*",
247247
"org.gradle.api.tasks.wrapper.*",
248248
"org.gradle.authentication.*",
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.javacs.kt.formatting
22

3-
import org.eclipse.lsp4j.FormattingOptions as LspFromattingOptions
3+
import org.eclipse.lsp4j.FormattingOptions as LspFormattingOptions
44

55
interface Formatter {
6-
fun format(code: String, options: LspFromattingOptions): String
6+
fun format(code: String, options: LspFormattingOptions): String
77
}
88

server/src/main/kotlin/org/javacs/kt/formatting/FormattingService.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package org.javacs.kt.formatting
22

33
import org.javacs.kt.Configuration
44
import org.javacs.kt.FormattingConfiguration
5-
import org.eclipse.lsp4j.FormattingOptions as LspFromattingOptions
5+
import org.eclipse.lsp4j.FormattingOptions as LspFormattingOptions
66

77
private const val DEFAULT_INDENT = 4
88

@@ -16,6 +16,6 @@ class FormattingService(private val config: FormattingConfiguration) {
1616

1717
fun formatKotlinCode(
1818
code: String,
19-
options: LspFromattingOptions = LspFromattingOptions(DEFAULT_INDENT, true)
19+
options: LspFormattingOptions = LspFormattingOptions(DEFAULT_INDENT, true)
2020
): String = this.formatter.format(code, options)
2121
}

server/src/main/kotlin/org/javacs/kt/index/ExtractSymbolVisibility.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.descriptors.*
44

55
object ExtractSymbolVisibility : DeclarationDescriptorVisitor<Symbol.Visibility, Unit> {
66
private fun convert(visibility: DescriptorVisibility): Symbol.Visibility = when (visibility.delegate) {
7-
Visibilities.PrivateToThis -> Symbol.Visibility.PRIAVTE_TO_THIS
7+
Visibilities.PrivateToThis -> Symbol.Visibility.PRIVATE_TO_THIS
88
Visibilities.Private -> Symbol.Visibility.PRIVATE
99
Visibilities.Internal -> Symbol.Visibility.INTERNAL
1010
Visibilities.Protected -> Symbol.Visibility.PROTECTED

server/src/main/kotlin/org/javacs/kt/index/Symbol.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ data class Symbol(
2727
}
2828

2929
enum class Visibility(val rawValue: Int) {
30-
PRIAVTE_TO_THIS(0),
30+
PRIVATE_TO_THIS(0),
3131
PRIVATE(1),
3232
INTERNAL(2),
3333
PROTECTED(3),

server/src/main/kotlin/org/javacs/kt/inlayhints/InlayHint.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ private fun declarationHint(
191191
) {
192192
if (!config.typeHints) return
193193

194-
//check decleration does not include type i.e. var t1: String
194+
//check declaration does not include type i.e. var t1: String
195195
if (node.typeReference != null) return
196196

197197
val hint = node.hintBuilder(InlayKind.TypeHint, file) ?: return

server/src/main/kotlin/org/javacs/kt/overridemembers/OverrideMembers.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ private fun getUnimplementedMembersStubs(file: CompiledFile, kotlinClass: KtClas
9191
.getContributedDescriptors()
9292
.filter { classMember ->
9393
classMember is MemberDescriptor &&
94-
classMember.canBeOverriden() &&
94+
classMember.canBeOverridden() &&
9595
!overridesDeclaration(kotlinClass, classMember)
9696
}
9797
.mapNotNull { member ->
@@ -111,7 +111,7 @@ private fun ClassDescriptor.canBeExtended() = this.kind.isInterface ||
111111
this.modality == Modality.ABSTRACT ||
112112
this.modality == Modality.OPEN
113113

114-
private fun MemberDescriptor.canBeOverriden() = (Modality.ABSTRACT == this.modality || Modality.OPEN == this.modality) && Modality.FINAL != this.modality && this.visibility != DescriptorVisibilities.PRIVATE && this.visibility != DescriptorVisibilities.PROTECTED
114+
private fun MemberDescriptor.canBeOverridden() = (Modality.ABSTRACT == this.modality || Modality.OPEN == this.modality) && Modality.FINAL != this.modality && this.visibility != DescriptorVisibilities.PRIVATE && this.visibility != DescriptorVisibilities.PROTECTED
115115

116116
// interfaces are ClassDescriptors by default. When calling AbstractClass super methods, we get a ClassConstructorDescriptor
117117
fun getClassDescriptor(descriptor: DeclarationDescriptor?): ClassDescriptor? =

server/src/test/kotlin/org/javacs/kt/ReferencesTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.hamcrest.MatcherAssert.assertThat
55
import org.junit.Test
66

77
class ReferencesTest : SingleFileTestFixture("references", "ReferenceTo.kt") {
8-
@Test fun `find referencs to foo`() {
8+
@Test fun `find references to foo`() {
99
val request = referenceParams(file, 2, 11)
1010
val references = languageServer.textDocumentService.references(request).get()
1111
val referenceStrs = references?.map { it.toString() }

server/src/test/resources/quickfixes/samefile.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class NullClass : NullMethodAndReturn<String> {}
2626

2727
abstract class MyAbstract {
2828
val otherValToTestAbstractOverride = 1
29-
29+
3030
abstract val name: String
3131

3232
abstract fun myFun()

server/src/test/resources/quickfixes/standardlib.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ import java.util.Comparator
44

55
class MyThread : Runnable {}
66

7-
class MyComperable : Comparator<String> {}
7+
class MyComparable : Comparator<String> {}
88

99
class MyList : AbstractList<String>() {}

0 commit comments

Comments
 (0)