Skip to content

Kotlin 2 #97

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.

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

Open
wants to merge 54 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
34f28de
Fix formatting
nicolas-guichard Dec 4, 2024
8f7e18b
Update Gradle wrapper
nicolas-guichard Dec 4, 2024
e711949
Bump com.google.protobuf
nicolas-guichard Dec 4, 2024
ca58d64
Migrate from ComponentRegistrar to CompilerPluginRegistrar
nicolas-guichard Dec 4, 2024
e92a3e7
Update to Kotlin 2.0
Oct 14, 2024
0bc2a4a
Update to Kotlin 2.1
Dec 16, 2024
c413aad
Revert test changes
nicolas-guichard Jan 13, 2025
7607b4f
cleanup: Optimize imports using IntelliJ
nicolas-guichard Mar 20, 2025
12c77e9
cleanup: Remove unused AnalyzerCheckers.semanticdbOutPathForFile
nicolas-guichard Mar 18, 2025
88e8036
cleanup: Remove unused SemanticFileChecker callback arg
nicolas-guichard Mar 18, 2025
e91959b
cleanup: Remove unused AnalyzerParamsProvider targetroot arg
nicolas-guichard Mar 18, 2025
3c9f745
cleanup: Remove unused AnalyzerDeclarationChecker
nicolas-guichard Mar 18, 2025
412926f
cleanup: Rename FirQualifiedAccessExpressionChecker.check arg to matc…
nicolas-guichard Mar 18, 2025
60d2062
cleanup: Move AnalyzerParamsProvider member declarations to ctor
nicolas-guichard Mar 18, 2025
33db8f0
cleanup: Remove unused DeclarationExtensions
nicolas-guichard Mar 18, 2025
d5b37a4
cleanup: Remove unused DescriptorResolver
nicolas-guichard Mar 18, 2025
81aa4e5
cleanup: Remove unused SemanticdbWriter
nicolas-guichard Mar 19, 2025
3f87c80
cleanup: Remove unused FirSimpleNameReferenceChecker
nicolas-guichard Mar 21, 2025
edcce4e
cleanup: Remove always false instance check
nicolas-guichard Mar 18, 2025
8a50efe
cleanup: Remove unused EMPTY_PACKAGE val
nicolas-guichard Mar 18, 2025
458e15b
cleanup: Remove unused SemanticdbTextDocumentBuilder.cache
nicolas-guichard Mar 19, 2025
d96d127
cleanup: Remove SemanticdbVisitor.file and lineMap properties
nicolas-guichard Mar 19, 2025
93d1a69
cleanup: Remove unreachable symbol is FirTypeAliasSymbol branch
nicolas-guichard Mar 19, 2025
52e9fa0
cleanup: Move TestAnalyzerParamsProvider property declarations to ctor
nicolas-guichard Mar 19, 2025
21273db
cleanup: Remove unused VisitorException
nicolas-guichard Mar 21, 2025
487c58e
cleanup: Remove broken functionDescriptorOverrides
nicolas-guichard Mar 21, 2025
842a4b5
cleanup: symbolOccurrence is not nullable
nicolas-guichard Mar 21, 2025
cadf19f
cleanup: Use map[key] = value instead of map.put(key, value)
nicolas-guichard Mar 21, 2025
84f94a4
cleanup: Remove unused FirConstructorSymbol.isFromTypeAlias
nicolas-guichard Mar 21, 2025
b5d5dd5
cleanup: Remove unused FirConstructorSymbol.getTypeAliasSymbol
nicolas-guichard Mar 21, 2025
fccce6c
cleanup: Remove unused getAllMethods
nicolas-guichard Mar 21, 2025
1734b76
cleanup: Remove unreachable disambiguatePropertySymbol
nicolas-guichard Mar 21, 2025
f7ee931
cleanup: Make ConeKotlinType?.render private
nicolas-guichard Mar 21, 2025
703db08
Fix exception handling
nicolas-guichard Jan 14, 2025
05f60a9
Fix class name to not embed all packages
nicolas-guichard Jan 13, 2025
076c936
Rework symbol construction
nicolas-guichard Jan 14, 2025
db65160
Rework method disambiguator
nicolas-guichard Jan 13, 2025
5d175ff
Fix getters/setters
nicolas-guichard Jan 14, 2025
59550a3
Fix extracting documentation
nicolas-guichard Mar 21, 2025
37ac403
Fix constructor symbols
nicolas-guichard Jan 14, 2025
57e49d3
Fix occurence ranges
nicolas-guichard Mar 21, 2025
0aa15e1
Package and import support
nicolas-guichard Jan 14, 2025
aa9ebe4
Type annotations
nicolas-guichard Mar 20, 2025
1f07443
Fix filtering supertypes
nicolas-guichard Jan 14, 2025
b3cde7e
Sort occurences by (startLine, startCharacter)
nicolas-guichard Mar 21, 2025
eaae6ea
Also emit class reference for synthetic function symbols
nicolas-guichard Mar 21, 2025
7f81fd1
Emit references to propeties as getter and setter
nicolas-guichard Mar 21, 2025
0382691
Fix class and function overridden symbols
nicolas-guichard Mar 26, 2025
fa1d1cb
Improve handling of anonymous objects
nicolas-guichard Mar 26, 2025
6546e6d
Don't emit reference to implicit type annotations
nicolas-guichard Mar 26, 2025
606ce4e
Function type annotations
nicolas-guichard Apr 9, 2025
ec1095e
Update to Kotlin 2.1.20
nicolas-guichard Apr 9, 2025
7f4bf25
Fix import as
nicolas-guichard Apr 9, 2025
60fd0fd
Children of local symbols are local symbols
nicolas-guichard Apr 10, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
with:
java-version: '8'
distribution: 'adopt'
cache: 'gradle'
- name: Test
run: ./gradlew test
run: ./gradlew test
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
id: tag
run: echo "version=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_OUTPUT
- uses: actions/setup-java@v3
with:
with:
java-version: '8'
distribution: 'adopt'
cache: 'gradle'
Expand All @@ -22,4 +22,4 @@ jobs:
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.PGP_SECRET }}
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.PGP_PASSPHRASE }}
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.PGP_PASSPHRASE }}
2 changes: 1 addition & 1 deletion .run/lsif-kotlin debug.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
</RunnerSettings>
<method v="2" />
</configuration>
</component>
</component>
2 changes: 1 addition & 1 deletion .run/lsif-kotlin test.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
<DebugAllEnabled>false</DebugAllEnabled>
<method v="2" />
</configuration>
</component>
</component>
2 changes: 1 addition & 1 deletion .run/lsif-kotlin_debug-project [compileKotlin].run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
<DebugAllEnabled>false</DebugAllEnabled>
<method v="2" />
</configuration>
</component>
</component>
2 changes: 1 addition & 1 deletion .run/lsif-kotlin_semanticdb-kotlin [build].run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
<DebugAllEnabled>false</DebugAllEnabled>
<method v="2" />
</configuration>
</component>
</component>
2 changes: 1 addition & 1 deletion .run/lsif-kotlin_semanticdb-kotlinc [test].run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
<DebugAllEnabled>false</DebugAllEnabled>
<method v="2" />
</configuration>
</component>
</component>
11 changes: 1 addition & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ details on how to generate SemanticDB files and convert SemanticDB into SCIP.

First, fetch the jar file of the SemanticDB compiler plugin:
[`com.sourcegraph:semanticdb-kotlinc:VERSION`](https://mvnrepository.com/artifact/com.sourcegraph/semanticdb-kotlinc).
For example, you can use
For example, you can use
[Coursier](https://get-coursier.io) to download the jar file.

```sh
Expand Down Expand Up @@ -75,12 +75,3 @@ If you have Coursier installed, you can run scip-java directly like this
cd $SOURCEROOT_DIRECTORY
./coursier launch --contrib scip-java -- index-semanticdb TARGETROOT_DIRECTORY
```









6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import groovy.lang.Closure
import org.gradle.jvm.toolchain.internal.CurrentJvmToolchainSpec

plugins {
kotlin("jvm") version "1.9.22"
id("com.github.johnrengelman.shadow") version "7.1.0"
id("com.palantir.git-version") version "0.12.3"
kotlin("jvm") version "2.1.20"
id("com.github.johnrengelman.shadow") version "8.1.1"
id("com.palantir.git-version") version "3.1.0"
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
id("com.diffplug.spotless") version "5.17.1"
}
Expand Down
2 changes: 1 addition & 1 deletion debug-project/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ tasks.withType<KotlinCompile> {
"plugin:semanticdb-kotlinc:targetroot=${targetroot}"
)
}
}
}
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
kotlin.code.style=official
org.gradle.parallel=true
org.gradle.caching=true
org.gradle.caching=true

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading