Skip to content

Commit 005a234

Browse files
DanielSouzaBertoldiDanielSouzaBertoldi
committed
Updating API Dumps
Also removed added languages in MimeType
1 parent 42a8203 commit 005a234

File tree

5 files changed

+36
-84
lines changed

5 files changed

+36
-84
lines changed

‎platform/jewel/foundation/api-dump-experimental.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ f:org.jetbrains.jewel.foundation.JewelFlags
44
- *f:getUseCustomPopupRenderer():Z
55
- *f:setUseCustomPopupRenderer(Z):V
66
*:org.jetbrains.jewel.foundation.code.highlighting.CodeHighlighter
7+
- a:highlight(java.lang.String,java.lang.String):kotlinx.coroutines.flow.Flow
8+
- bs:highlight$default(org.jetbrains.jewel.foundation.code.highlighting.CodeHighlighter,java.lang.String,java.lang.String,I,java.lang.Object):kotlinx.coroutines.flow.Flow
79
- a:highlight-zTGadEY(java.lang.String,java.lang.String):kotlinx.coroutines.flow.Flow
810
f:org.jetbrains.jewel.foundation.theme.JewelTheme$Companion
911
- *f:getInstanceUuid(androidx.compose.runtime.Composer,I):java.util.UUID

‎platform/jewel/foundation/api-dump.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ f:org.jetbrains.jewel.foundation.code.highlighting.NoOpCodeHighlighter
201201
- org.jetbrains.jewel.foundation.code.highlighting.CodeHighlighter
202202
- sf:$stable:I
203203
- sf:INSTANCE:org.jetbrains.jewel.foundation.code.highlighting.NoOpCodeHighlighter
204+
- highlight(java.lang.String,java.lang.String):kotlinx.coroutines.flow.Flow
204205
- highlight-zTGadEY(java.lang.String,java.lang.String):kotlinx.coroutines.flow.Flow
205206
f:org.jetbrains.jewel.foundation.layout.BasicTableLayoutKt
206207
- sf:BasicTableLayout-yE4rkUQ(I,I,J,androidx.compose.ui.Modifier,F,java.util.List,androidx.compose.runtime.Composer,I,I):V

‎platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/code/MimeType.kt‎

Lines changed: 14 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,24 @@ import org.jetbrains.jewel.foundation.code.MimeType.Known.AGSL
44
import org.jetbrains.jewel.foundation.code.MimeType.Known.AIDL
55
import org.jetbrains.jewel.foundation.code.MimeType.Known.C
66
import org.jetbrains.jewel.foundation.code.MimeType.Known.CPP
7-
import org.jetbrains.jewel.foundation.code.MimeType.Known.CSS
87
import org.jetbrains.jewel.foundation.code.MimeType.Known.DART
98
import org.jetbrains.jewel.foundation.code.MimeType.Known.DIFF
109
import org.jetbrains.jewel.foundation.code.MimeType.Known.GO
1110
import org.jetbrains.jewel.foundation.code.MimeType.Known.GRADLE
1211
import org.jetbrains.jewel.foundation.code.MimeType.Known.GRADLE_KTS
1312
import org.jetbrains.jewel.foundation.code.MimeType.Known.GROOVY
14-
import org.jetbrains.jewel.foundation.code.MimeType.Known.HTML
1513
import org.jetbrains.jewel.foundation.code.MimeType.Known.JAVA
1614
import org.jetbrains.jewel.foundation.code.MimeType.Known.JAVASCRIPT
1715
import org.jetbrains.jewel.foundation.code.MimeType.Known.JSON
18-
import org.jetbrains.jewel.foundation.code.MimeType.Known.JSON5
19-
import org.jetbrains.jewel.foundation.code.MimeType.Known.JSON_LINES
2016
import org.jetbrains.jewel.foundation.code.MimeType.Known.KOTLIN
2117
import org.jetbrains.jewel.foundation.code.MimeType.Known.MANIFEST
22-
import org.jetbrains.jewel.foundation.code.MimeType.Known.OBJECTIVE_C
2318
import org.jetbrains.jewel.foundation.code.MimeType.Known.PATCH
2419
import org.jetbrains.jewel.foundation.code.MimeType.Known.PROGUARD
2520
import org.jetbrains.jewel.foundation.code.MimeType.Known.PROPERTIES
2621
import org.jetbrains.jewel.foundation.code.MimeType.Known.PROTO
2722
import org.jetbrains.jewel.foundation.code.MimeType.Known.PYTHON
2823
import org.jetbrains.jewel.foundation.code.MimeType.Known.REGEX
2924
import org.jetbrains.jewel.foundation.code.MimeType.Known.RESOURCE
30-
import org.jetbrains.jewel.foundation.code.MimeType.Known.RUBY
3125
import org.jetbrains.jewel.foundation.code.MimeType.Known.RUST
3226
import org.jetbrains.jewel.foundation.code.MimeType.Known.SHELL
3327
import org.jetbrains.jewel.foundation.code.MimeType.Known.SQL
@@ -37,7 +31,6 @@ import org.jetbrains.jewel.foundation.code.MimeType.Known.TOML
3731
import org.jetbrains.jewel.foundation.code.MimeType.Known.TYPESCRIPT
3832
import org.jetbrains.jewel.foundation.code.MimeType.Known.UNKNOWN
3933
import org.jetbrains.jewel.foundation.code.MimeType.Known.VERSION_CATALOG
40-
import org.jetbrains.jewel.foundation.code.MimeType.Known.XHTML
4134
import org.jetbrains.jewel.foundation.code.MimeType.Known.XML
4235
import org.jetbrains.jewel.foundation.code.MimeType.Known.YAML
4336

@@ -111,14 +104,12 @@ public value class MimeType(private val mimeType: String) {
111104
val folderType = getAttribute(ATTR_FOLDER_TYPE)
112105
folderType?.capitalizeAsciiOnly() ?: "XML"
113106
}
107+
114108
else -> "XML"
115109
}
116110
}
117-
HTML.mimeType -> "HTML"
118-
XHTML.mimeType -> "XHTML"
111+
119112
JSON.mimeType -> "JSON"
120-
JSON5.mimeType -> "JSON5"
121-
JSON_LINES.mimeType -> "JSON Lines"
122113
TEXT.mimeType -> "Text"
123114
REGEX.mimeType -> "Regular Expression"
124115
GROOVY.mimeType -> if (isGradle()) "Gradle" else "Groovy"
@@ -142,47 +133,6 @@ public value class MimeType(private val mimeType: String) {
142133
else -> mimeType
143134
}
144135

145-
public fun toFileExtensionIfKnown(): String? =
146-
when (mimeType) {
147-
AGSL.mimeType -> "agsl"
148-
AIDL.mimeType -> "aidl"
149-
C.mimeType -> "c"
150-
CPP.mimeType -> "cpp"
151-
CSS.mimeType -> "css"
152-
DART.mimeType -> "dart"
153-
GO.mimeType -> "go"
154-
GRADLE.mimeType -> "gradle"
155-
GRADLE_KTS.mimeType -> "kts"
156-
GROOVY.mimeType -> "groovy"
157-
JAVA.mimeType -> "java"
158-
JAVASCRIPT.mimeType -> "js"
159-
JSON.mimeType -> "json"
160-
JSON5.mimeType -> "json5"
161-
JSON_LINES.mimeType -> "jsonl"
162-
KOTLIN.mimeType -> "kt"
163-
MANIFEST.mimeType -> "xml" // Manifest files
164-
PROGUARD.mimeType -> "pro"
165-
PROPERTIES.mimeType -> "properties"
166-
PROTO.mimeType -> "proto"
167-
PYTHON.mimeType -> "py"
168-
REGEX.mimeType -> "regex"
169-
RESOURCE.mimeType -> "xml" // Resource files
170-
RUST.mimeType -> "rs"
171-
SHELL.mimeType -> "sh"
172-
SQL.mimeType -> "sql"
173-
SVG.mimeType -> "svg"
174-
TEXT.mimeType -> "txt"
175-
TOML.mimeType -> "toml"
176-
TYPESCRIPT.mimeType -> "ts"
177-
VERSION_CATALOG.mimeType -> "toml"
178-
XML.mimeType -> "xml"
179-
YAML.mimeType -> "yaml"
180-
RUBY.mimeType -> "rb"
181-
OBJECTIVE_C.mimeType -> "m"
182-
"text/x-erlang" -> "erl"
183-
else -> null
184-
}
185-
186136
private fun getBaseMimeType(): String {
187137
val baseMimeType = base().toString()
188138
// Built-ins are already normalized, don't do string and sorting work
@@ -309,12 +259,7 @@ public value class MimeType(private val mimeType: String) {
309259
public val XML: MimeType = MimeType("text/xml")
310260
public val PROPERTIES: MimeType = MimeType("text/properties")
311261
public val TOML: MimeType = MimeType("text/toml")
312-
public val HTML: MimeType = MimeType("text/html")
313-
public val XHTML: MimeType = MimeType("application/xhtml+xml")
314-
public val CSS: MimeType = MimeType("text/css")
315262
public val JSON: MimeType = MimeType("text/json")
316-
public val JSON5: MimeType = MimeType("text/json5")
317-
public val JSON_LINES: MimeType = MimeType("application/x-ndjson")
318263
public val REGEX: MimeType = MimeType("text/x-regex-source")
319264
public val GROOVY: MimeType = MimeType("text/groovy")
320265
public val C: MimeType = MimeType("text/c")
@@ -333,9 +278,6 @@ public value class MimeType(private val mimeType: String) {
333278
public val SHELL: MimeType = MimeType("application/x-sh")
334279
public val YAML: MimeType = MimeType("text/yaml")
335280
public val GO: MimeType = MimeType("text/go")
336-
public val RUBY: MimeType = MimeType("text/x-ruby")
337-
public val CLOJURE: MimeType = MimeType("text/x-clojure")
338-
public val OBJECTIVE_C: MimeType = MimeType("text/x-objectivec")
339281

340282
/** Note that most resource files will also have a folder type, so don't use equality on this mime type */
341283
public val RESOURCE: MimeType = MimeType("$XML; $ATTR_ROLE=resource")
@@ -352,21 +294,15 @@ public value class MimeType(private val mimeType: String) {
352294
"kotlin",
353295
"kt",
354296
"kts" -> KOTLIN
355-
"clj",
356-
"cljs",
357-
"cljr",
358-
"cljc",
359-
"cljd" -> CLOJURE
297+
360298
"java" -> JAVA
361-
"html" -> HTML
362-
"xhtml" -> XHTML
363-
"css" -> CSS
364-
"json" -> JSON
365-
"json5" -> JSON5
366-
"json lines",
367-
"jsonl" -> JSON_LINES
299+
"xml" -> XML
300+
"json",
301+
"json5" -> JSON
302+
368303
"regex",
369304
"regexp" -> REGEX
305+
370306
"groovy" -> GROOVY
371307
"toml" -> TOML
372308
"c" -> C
@@ -380,23 +316,28 @@ public value class MimeType(private val mimeType: String) {
380316
"python3",
381317
"py",
382318
"python" -> PYTHON
319+
383320
"dart" -> DART
384321
"rust" -> RUST
385322
"js",
386323
"javascript" -> JAVASCRIPT
387-
"ts",
324+
388325
"typescript" -> TYPESCRIPT
389326
"sksl" -> AGSL
390327
"sh",
391328
"bash",
392329
"zsh",
393330
"shell" -> SHELL
331+
394332
"yaml",
395333
"yml" -> YAML
334+
396335
"go",
397336
"golang" -> GO
337+
398338
"diff" -> DIFF
399339
"patch" -> PATCH
340+
400341
else -> null
401342
}
402343
}

‎platform/jewel/markdown/core/api-dump-experimental.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,14 @@
103103
- getContent():java.lang.String
104104
- f:getMimeType-VwCp3SY():java.lang.String
105105
- hashCode():I
106+
*f:org.jetbrains.jewel.markdown.MarkdownBlock$CodeBlock$FencedCodeBlockInfo
107+
- org.jetbrains.jewel.markdown.MarkdownBlock$CodeBlock
108+
- sf:$stable:I
109+
- <init>(java.lang.String,java.lang.String):V
110+
- equals(java.lang.Object):Z
111+
- getContent():java.lang.String
112+
- f:getInfo():java.lang.String
113+
- hashCode():I
106114
*f:org.jetbrains.jewel.markdown.MarkdownBlock$CodeBlock$IndentedCodeBlock
107115
- org.jetbrains.jewel.markdown.MarkdownBlock$CodeBlock
108116
- sf:$stable:I
@@ -299,6 +307,7 @@ f:org.jetbrains.jewel.markdown.processing.ProcessingUtilKt
299307
- render(java.util.List,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V
300308
- render(org.jetbrains.jewel.markdown.MarkdownBlock$BlockQuote,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$BlockQuote,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V
301309
- render(org.jetbrains.jewel.markdown.MarkdownBlock$CodeBlock$FencedCodeBlock,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Code$Fenced,Z,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V
310+
- render(org.jetbrains.jewel.markdown.MarkdownBlock$CodeBlock$FencedCodeBlockInfo,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Code$Fenced,Z,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V
302311
- render(org.jetbrains.jewel.markdown.MarkdownBlock$CodeBlock$IndentedCodeBlock,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Code$Indented,Z,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V
303312
- render(org.jetbrains.jewel.markdown.MarkdownBlock$CodeBlock,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Code,Z,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V
304313
- render(org.jetbrains.jewel.markdown.MarkdownBlock$Heading,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading$HN,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V

‎platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/scrolling/ScrollSyncMarkdownBlockRenderer.kt‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public open class ScrollSyncMarkdownBlockRenderer(
6262
// but using the wrapper in overloaded functions here to pass to AutoScrollableBlock
6363
val blocks = remember { mutableStateOf(block) }
6464
blocks.value = block
65-
CompositionLocalProvider(LocalLocatableBlock provides blocks.value) {
65+
CompositionLocalProvider(localUniqueBlock provides blocks.value) {
6666
// Don't recompose unchanged blocks
6767
// val ogBlock = remember(block) { block.originalBlock }
6868
super.RenderBlock(block.originalBlock, enabled, onUrlClick, modifier)
@@ -86,7 +86,7 @@ public open class ScrollSyncMarkdownBlockRenderer(
8686
super.RenderParagraph(block, styling, enabled, onUrlClick, modifier)
8787
return
8888
}
89-
val uniqueBlock = LocalLocatableBlock.current?.takeIf { it.originalBlock == block } ?: block
89+
val uniqueBlock = localUniqueBlock.current?.takeIf { it.originalBlock == block } ?: block
9090
AutoScrollableBlock(uniqueBlock, synchronizer) {
9191
super.RenderParagraph(block, styling, enabled, onUrlClick, modifier)
9292
}
@@ -106,7 +106,7 @@ public open class ScrollSyncMarkdownBlockRenderer(
106106
super.RenderHeading(block, styling, enabled, onUrlClick, modifier)
107107
return
108108
}
109-
val uniqueBlock = LocalLocatableBlock.current?.takeIf { it.originalBlock == block } ?: block
109+
val uniqueBlock = localUniqueBlock.current?.takeIf { it.originalBlock == block } ?: block
110110
AutoScrollableBlock(uniqueBlock, synchronizer) {
111111
super.RenderHeading(block, styling, enabled, onUrlClick, modifier)
112112
}
@@ -127,9 +127,9 @@ public open class ScrollSyncMarkdownBlockRenderer(
127127
enabled: Boolean,
128128
) {
129129
val synchronizer =
130-
(JewelTheme.markdownMode as? MarkdownMode.EditorPreview)?.scrollingSynchronizer
130+
(JewelTheme.markdownMode as? EditorPreview)?.scrollingSynchronizer
131131
?: run {
132-
super.renderCodeWithMimeType(block, mimeType, styling, enabled)
132+
super.RenderCodeWithMimeType(block, mimeType, styling, enabled)
133133
return
134134
}
135135

@@ -151,22 +151,22 @@ public open class ScrollSyncMarkdownBlockRenderer(
151151
}
152152

153153
@Composable
154-
override fun renderCodeWithBlockInfo(
154+
override fun RenderCodeWithBlockInfo(
155155
block: FencedCodeBlockInfo,
156156
styling: MarkdownStyling.Code.Fenced,
157157
enabled: Boolean,
158158
) {
159159
val synchronizer =
160160
(JewelTheme.markdownMode as? EditorPreview)?.scrollingSynchronizer
161161
?: run {
162-
super.renderCodeWithBlockInfo(block, styling, enabled)
162+
super.RenderCodeWithBlockInfo(block, styling, enabled)
163163
return
164164
}
165165

166166
val content = block.content
167167
val highlightedCode by
168168
LocalCodeHighlighter.current.highlight(content, block.info).collectAsState(AnnotatedString(content))
169-
val uniqueBlock = LocalLocatableBlock.current?.takeIf { it.originalBlock == block } ?: block
169+
val uniqueBlock = localUniqueBlock.current?.takeIf { it.originalBlock == block } ?: block
170170
val actualBlock by rememberUpdatedState(uniqueBlock)
171171
AutoScrollableBlock(actualBlock, synchronizer) {
172172
Text(
@@ -199,7 +199,7 @@ public open class ScrollSyncMarkdownBlockRenderer(
199199
.border(styling.borderWidth, styling.borderColor, styling.shape)
200200
.then(if (styling.fillWidth) Modifier.fillMaxWidth() else Modifier),
201201
) {
202-
val uniqueBlock = LocalLocatableBlock.current?.takeIf { it.originalBlock == block } ?: block
202+
val uniqueBlock = localUniqueBlock.current?.takeIf { it.originalBlock == block } ?: block
203203
val actualBlock by rememberUpdatedState(uniqueBlock)
204204
AutoScrollableBlock(actualBlock, scrollingSynchronizer, Modifier.padding(styling.padding)) {
205205
Text(
@@ -217,8 +217,7 @@ public open class ScrollSyncMarkdownBlockRenderer(
217217
}
218218
}
219219

220-
@Suppress("VariableNaming", "property-naming", "PrivatePropertyName")
221-
private val LocalLocatableBlock: ProvidableCompositionLocal<LocatableMarkdownBlock?> = staticCompositionLocalOf {
220+
private val localUniqueBlock: ProvidableCompositionLocal<LocatableMarkdownBlock?> = staticCompositionLocalOf {
222221
null
223222
}
224223
}

0 commit comments

Comments
 (0)