Original PR: https://github.com/apple/pkl/pull/96 Author: @bioball Created: 2/8/2024 Status: ✅ Merged Merged: 2/8/2024 Merged by: @bioball
Base: main ← Head: pkldoc-fixes
main
pkldoc-fixes
4ff6f77
1f9f7d5
34da973
126 files changed (+3234 additions, -2560 deletions)
📝 pkl-core/src/main/java/org/pkl/core/util/IoUtils.java (+3 -3) 📝 pkl-core/src/test/kotlin/org/pkl/core/runtime/DefaultModuleResolverTest.kt (+1 -1) 📝 pkl-doc/src/main/kotlin/org/pkl/doc/ClassPageGenerator.kt (+2 -2) 📝 pkl-doc/src/main/kotlin/org/pkl/doc/DocGenerator.kt (+1 -2) 📝 pkl-doc/src/main/kotlin/org/pkl/doc/DocPackageInfo.kt (+8 -4) 📝 pkl-doc/src/main/kotlin/org/pkl/doc/DocScope.kt (+6 -6) 📝 pkl-doc/src/main/kotlin/org/pkl/doc/MainOrPackagePageGenerator.kt (+5 -1) 📝 pkl-doc/src/main/kotlin/org/pkl/doc/ModuleOrClassPageGenerator.kt (+2 -2) 📝 pkl-doc/src/main/kotlin/org/pkl/doc/ModulePageGenerator.kt (+2 -2) 📝 pkl-doc/src/main/kotlin/org/pkl/doc/PageGenerator.kt (+6 -6) 📝 pkl-doc/src/main/kotlin/org/pkl/doc/Util.kt (+33 -0) 📝 pkl-doc/src/test/files/DocGeneratorTest/input/com.externalpackage/doc-package-info.pkl (+1 -1) ➕ pkl-doc/src/test/files/DocGeneratorTest/input/com.package1/Module Containing Spaces.pkl (+2 -0) 📝 pkl-doc/src/test/files/DocGeneratorTest/input/com.package1/doc-package-info.pkl (+1 -1) ➕ pkl-doc/src/test/files/DocGeneratorTest/input/com.package1/referenceToExternalPackage.pkl (+4 -0) 📝 pkl-doc/src/test/files/DocGeneratorTest/input/com.package2/Module3.pkl (+7 -0) ➕ pkl-doc/src/test/files/DocGeneratorTest/output/com.package1/1.2.3/Module Containing Spaces/index.html (+196 -0) 📝 pkl-doc/src/test/files/DocGeneratorTest/output/com.package1/1.2.3/baseModule/BaseClass.html (+21 -21) 📝 pkl-doc/src/test/files/DocGeneratorTest/output/com.package1/1.2.3/baseModule/index.html (+28 -28) 📝 pkl-doc/src/test/files/DocGeneratorTest/output/com.package1/1.2.3/classAnnotations/AnnotatedClass.html (+21 -21)
pkl-core/src/main/java/org/pkl/core/util/IoUtils.java
pkl-core/src/test/kotlin/org/pkl/core/runtime/DefaultModuleResolverTest.kt
pkl-doc/src/main/kotlin/org/pkl/doc/ClassPageGenerator.kt
pkl-doc/src/main/kotlin/org/pkl/doc/DocGenerator.kt
pkl-doc/src/main/kotlin/org/pkl/doc/DocPackageInfo.kt
pkl-doc/src/main/kotlin/org/pkl/doc/DocScope.kt
pkl-doc/src/main/kotlin/org/pkl/doc/MainOrPackagePageGenerator.kt
pkl-doc/src/main/kotlin/org/pkl/doc/ModuleOrClassPageGenerator.kt
pkl-doc/src/main/kotlin/org/pkl/doc/ModulePageGenerator.kt
pkl-doc/src/main/kotlin/org/pkl/doc/PageGenerator.kt
pkl-doc/src/main/kotlin/org/pkl/doc/Util.kt
pkl-doc/src/test/files/DocGeneratorTest/input/com.externalpackage/doc-package-info.pkl
pkl-doc/src/test/files/DocGeneratorTest/input/com.package1/Module Containing Spaces.pkl
pkl-doc/src/test/files/DocGeneratorTest/input/com.package1/doc-package-info.pkl
pkl-doc/src/test/files/DocGeneratorTest/input/com.package1/referenceToExternalPackage.pkl
pkl-doc/src/test/files/DocGeneratorTest/input/com.package2/Module3.pkl
pkl-doc/src/test/files/DocGeneratorTest/output/com.package1/1.2.3/Module Containing Spaces/index.html
pkl-doc/src/test/files/DocGeneratorTest/output/com.package1/1.2.3/baseModule/BaseClass.html
pkl-doc/src/test/files/DocGeneratorTest/output/com.package1/1.2.3/baseModule/index.html
pkl-doc/src/test/files/DocGeneratorTest/output/com.package1/1.2.3/classAnnotations/AnnotatedClass.html
...and 80 more files
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.
No dependencies set.
The note is not visible to the blocked user.
📋 Pull Request Information
Original PR: https://github.com/apple/pkl/pull/96
Author: @bioball
Created: 2/8/2024
Status: ✅ Merged
Merged: 2/8/2024
Merged by: @bioball
Base:
main← Head:pkldoc-fixes📝 Commits (3)
4ff6f77Fixes for pkldoc1f9f7d5XML escape anchor ids34da973Re-do URI escaped anchor ids, add test📊 Changes
126 files changed (+3234 additions, -2560 deletions)
View changed files
📝
pkl-core/src/main/java/org/pkl/core/util/IoUtils.java(+3 -3)📝
pkl-core/src/test/kotlin/org/pkl/core/runtime/DefaultModuleResolverTest.kt(+1 -1)📝
pkl-doc/src/main/kotlin/org/pkl/doc/ClassPageGenerator.kt(+2 -2)📝
pkl-doc/src/main/kotlin/org/pkl/doc/DocGenerator.kt(+1 -2)📝
pkl-doc/src/main/kotlin/org/pkl/doc/DocPackageInfo.kt(+8 -4)📝
pkl-doc/src/main/kotlin/org/pkl/doc/DocScope.kt(+6 -6)📝
pkl-doc/src/main/kotlin/org/pkl/doc/MainOrPackagePageGenerator.kt(+5 -1)📝
pkl-doc/src/main/kotlin/org/pkl/doc/ModuleOrClassPageGenerator.kt(+2 -2)📝
pkl-doc/src/main/kotlin/org/pkl/doc/ModulePageGenerator.kt(+2 -2)📝
pkl-doc/src/main/kotlin/org/pkl/doc/PageGenerator.kt(+6 -6)📝
pkl-doc/src/main/kotlin/org/pkl/doc/Util.kt(+33 -0)📝
pkl-doc/src/test/files/DocGeneratorTest/input/com.externalpackage/doc-package-info.pkl(+1 -1)➕
pkl-doc/src/test/files/DocGeneratorTest/input/com.package1/Module Containing Spaces.pkl(+2 -0)📝
pkl-doc/src/test/files/DocGeneratorTest/input/com.package1/doc-package-info.pkl(+1 -1)➕
pkl-doc/src/test/files/DocGeneratorTest/input/com.package1/referenceToExternalPackage.pkl(+4 -0)📝
pkl-doc/src/test/files/DocGeneratorTest/input/com.package2/Module3.pkl(+7 -0)➕
pkl-doc/src/test/files/DocGeneratorTest/output/com.package1/1.2.3/Module Containing Spaces/index.html(+196 -0)📝
pkl-doc/src/test/files/DocGeneratorTest/output/com.package1/1.2.3/baseModule/BaseClass.html(+21 -21)📝
pkl-doc/src/test/files/DocGeneratorTest/output/com.package1/1.2.3/baseModule/index.html(+28 -28)📝
pkl-doc/src/test/files/DocGeneratorTest/output/com.package1/1.2.3/classAnnotations/AnnotatedClass.html(+21 -21)...and 80 more files
📄 Description
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.