minor fix for typo, indent, link, and sample code, etc #4993

LiYing2010 · 2025-08-05T10:13:28Z

Change List

fixed code style of sample code
fixed language of sample code
fixed some incorrect content

LiYing2010 · 2025-08-05T10:15:58Z

docs/topics/js/js-project-setup.md

@@ -100,7 +100,7 @@ You can enable all the supported ES2015 features at once by adding the `es2015`

 ```kotlin
 tasks.withType<KotlinJsCompile>().configureEach {
-    kotlinOptions {
+    compilerOptions {


JFYI
IMO:
kotlinOptions is deprecated, should use compilerOptions instead

LiYing2010 · 2025-08-05T10:19:32Z

docs/topics/tour/kotlin-tour-intermediate-classes-interfaces.md

+If you wanted to create a new class which implements the `Drawable` interface, and have the same behavior with `Circle`
+class **except** for the value of the `color` property, you still need to add implementations for each member function
+of the `Drawable` interface:

 ```kotlin
-class RedCircle(val circle: Circle) : Circle {
-
+class RedCircle(val circle: Circle) : Drawable {


JFYI
IMO:
if class RedCircle extends class Circle, it will inherit all the member functions, which means there will be no necessary to implement func draw() and resize()

so I think the sample code here will confuse the readers, and I suggest to change it

You're right that this example could be improved. I'm covering this in #5026 Can you revert the changes in this file since I'll replace it very soon?

OK
I reverted this change

LiYing2010 · 2025-08-05T10:22:31Z

docs/topics/wasm/wasm-debugging.md

@@ -37,7 +37,7 @@ Create a project using the Kotlin Multiplatform wizard:
   >
   {style="note"}

-2. In **composeApp** | **Tasks** | **kotlin browser**, select and run the **wasmJsBrowserDevelopmentRun** task.
+2. In **wasmdemo** | **Tasks** | **kotlin browser**, select and run the **wasmJsBrowserDevelopmentRun** task.


JFYI
the demo project name was changed to WasmDemo, but this content still use the old name composeApp

LiYing2010 · 2025-08-05T10:23:46Z

docs/topics/whatsnew/whatsnew22.md

@@ -235,7 +235,7 @@ This feature tells the compiler to apply the annotation to all relevant parts of

 * **`get`**: the getter method.

-* **`set_param`**: the parameter of the setter method, if the property is defined as `var`.
+* **`setparam`**: the parameter of the setter method, if the property is defined as `var`.


IMO
I think setparam is the correct use-site target name

Yes, it is! We fixed the KEEP as well. Kotlin/KEEP@568ecac

I merged your changes from master branch

LiYing2010 · 2025-08-05T10:27:03Z

@sarahhaggarty
could you please review this?
thank you~~~

docs/topics/serialization.md

sarahhaggarty

Thanks for your suggestions @LiYing2010 !
Can you rebase your branch onto the latest on master to pick up the changes we made in annotations.md? And please take a look at my suggestions for changes. Let me know if you have any questions!

sarahhaggarty · 2025-08-05T13:05:29Z

docs/topics/gradle/gradle-configure-project.md

@@ -63,7 +63,7 @@ In the following table, there are the minimum and maximum **fully supported** ve
 | 1.7.0–1.7.10  | 6.7.1–7.0.2                           | 3.4.3–7.0.2                                         |
 | 1.6.20–1.6.21 | 6.1.1–7.0.2                           | 3.4.3–7.0.2                                         |

-> *Kotlin 2.0.20–2.0.21 and Kotlin 2.1.0–2.1.10 are fully compatible with Gradle up to 8.6.
+> Kotlin 2.0.20–2.0.21 and Kotlin 2.1.0–2.1.10 are fully compatible with Gradle up to 8.6.


Suggested change

> Kotlin 2.0.20–2.0.21 and Kotlin 2.1.0–2.1.10 are fully compatible with Gradle up to 8.6.

> *Kotlin 2.0.20–2.0.21 and Kotlin 2.1.0–2.1.10 are fully compatible with Gradle up to 8.6.

This asterisk refers to an entry in the table.

OK
I reverted this change

sarahhaggarty · 2025-08-25T08:34:49Z

docs/topics/whatsnew/whatsnew22.md

@@ -235,7 +235,7 @@ This feature tells the compiler to apply the annotation to all relevant parts of

 * **`get`**: the getter method.

-* **`set_param`**: the parameter of the setter method, if the property is defined as `var`.
+* **`setparam`**: the parameter of the setter method, if the property is defined as `var`.


Yes, it is! We fixed the KEEP as well. Kotlin/KEEP@568ecac

sarahhaggarty · 2025-08-25T08:44:20Z

docs/topics/whatsnew/whatsnew22.md

+    // Applies @Email to `param`, `property`, `field`,
+    // `get`, and `setparam` (if var)


Suggested change

// Applies @Email to `param`, `property`, `field`,

// `get`, and `setparam` (if var)

// Applies @Email to param, property, field,

// get, and setparam (if var)

We don't use backticks in code comments. I fixed this in the original doc.

I merged your changes from master branch

sarahhaggarty · 2025-08-25T08:44:53Z

docs/topics/whatsnew/whatsnew22.md

+    // Applies @Email to `property`, `field`, and `get`
+    // (no `param` since it's not in the constructor)


Suggested change

// Applies @Email to `property`, `field`, and `get`

// (no `param` since it's not in the constructor)

// Applies @Email to property, field, and get

// (no param since it's not in the constructor)

We don't use backticks in code comments. I fixed this in the original doc.

I merged your changes from master branch

sarahhaggarty · 2025-08-25T08:50:45Z

docs/topics/tour/kotlin-tour-intermediate-classes-interfaces.md

+If you wanted to create a new class which implements the `Drawable` interface, and have the same behavior with `Circle`
+class **except** for the value of the `color` property, you still need to add implementations for each member function
+of the `Drawable` interface:

 ```kotlin
-class RedCircle(val circle: Circle) : Circle {
-
+class RedCircle(val circle: Circle) : Drawable {


You're right that this example could be improved. I'm covering this in #5026 Can you revert the changes in this file since I'll replace it very soon?

# Conflicts: # docs/topics/annotations.md # docs/topics/whatsnew/whatsnew22.md

sarahhaggarty · 2025-08-26T07:43:00Z

Thanks again for your contribution @LiYing2010 ! 🚀

minor fix for typo, indent, link, and sample code, etc

7a8f328

LiYing2010 requested a review from a team as a code owner August 5, 2025 10:13

LiYing2010 commented Aug 5, 2025

View reviewed changes

sarahhaggarty self-assigned this Aug 5, 2025

daniCsorbaJB reviewed Aug 5, 2025

View reviewed changes

docs/topics/serialization.md Outdated Show resolved Hide resolved

daniCsorbaJB reviewed Aug 5, 2025

View reviewed changes

docs/topics/serialization.md Outdated Show resolved Hide resolved

fix for review comment

63c818f

LiYing2010 requested a review from daniCsorbaJB August 5, 2025 16:36

sarahhaggarty requested changes Aug 25, 2025

View reviewed changes

LiYing2010 added 2 commits August 25, 2025 20:27

Merge remote-tracking branch 'upstream/master' into minor_fix

bf9349a

# Conflicts: # docs/topics/annotations.md # docs/topics/whatsnew/whatsnew22.md

fix for review comment

a962757

LiYing2010 force-pushed the minor_fix branch from 914972c to a962757 Compare August 25, 2025 11:40

sarahhaggarty approved these changes Aug 26, 2025

View reviewed changes

sarahhaggarty merged commit 024c38a into JetBrains:master Aug 26, 2025
4 checks passed

LiYing2010 deleted the minor_fix branch August 26, 2025 09:03

	> Kotlin 2.0.20–2.0.21 and Kotlin 2.1.0–2.1.10 are fully compatible with Gradle up to 8.6.
	> *Kotlin 2.0.20–2.0.21 and Kotlin 2.1.0–2.1.10 are fully compatible with Gradle up to 8.6.

		// Applies @Email to `param`, `property`, `field`,
		// `get`, and `setparam` (if var)

		// Applies @Email to `property`, `field`, and `get`
		// (no `param` since it's not in the constructor)

minor fix for typo, indent, link, and sample code, etc #4993

minor fix for typo, indent, link, and sample code, etc #4993

Uh oh!

Conversation

LiYing2010 commented Aug 5, 2025

Change List

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

LiYing2010 commented Aug 5, 2025

Uh oh!

Uh oh!

Uh oh!

sarahhaggarty left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

sarahhaggarty commented Aug 26, 2025

Uh oh!

Uh oh!