Reset

Author: Dedelweiss

dist/bin/common

@@ -131,34 +131,9 @@ fi
 #/*--------------------------------------------------
 # * The code below is for Dotty
 # *-------------------------------------------------*/
-# Try to autodetect real location of the script
-if [ -z "${PROG_HOME-}" ] ; then
-  ## resolve links - $0 may be a link to PROG_HOME
-  PRG="$0"
-
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG="`dirname "$PRG"`/$link"
-    fi
-  done
-
-  saveddir=`pwd`
-
-  PROG_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  PROG_HOME=`cd "$PROG_HOME" && pwd`
-
-  cd "$saveddir"
-fi
 
 find_lib () {
-  for lib in $saveddir/dist/target/pack/lib/$1 ; do
+  for lib in "$PROG_HOME"/lib/$1 ; do
     if [[ -f "$lib" ]]; then
       if [ -n "$CYGPATHCMD" ]; then
         "$CYGPATHCMD" -am "$lib"

dist/bin/scaladoc

@@ -28,7 +28,7 @@ if [ -z "${PROG_HOME-}" ] ; then
   cd "$saveddir"
 fi
 
-source "$saveddir/dist/bin/common"
+source "$PROG_HOME/bin/common"
 default_java_opts="-Xmx768m -Xms768m"
 withCompiler=true
 
@@ -66,6 +66,7 @@ classpathArgs () {
   CLASS_PATH+="$(find_lib "*flexmark-ext-emoji*")$PSEP"
   CLASS_PATH+="$(find_lib "*flexmark-ext-gfm-strikethrough*")$PSEP"
   CLASS_PATH+="$(find_lib "*flexmark-ext-gfm-tasklist*")$PSEP"
+  CLASS_PATH+="$(find_lib "*flexmark-ext-gfm-tables*")$PSEP"
   CLASS_PATH+="$(find_lib "*flexmark-ext-wikilink*")$PSEP"
   CLASS_PATH+="$(find_lib "*flexmark-ext-yaml-front-matter*")$PSEP"
   CLASS_PATH+="$(find_lib "*flexmark-ext-tables*")$PSEP"
@@ -75,6 +76,12 @@ classpathArgs () {
   CLASS_PATH+="$(find_lib "*flexmark-util-data*")$PSEP"
   CLASS_PATH+="$(find_lib "*flexmark-util-dependency*")$PSEP"
   CLASS_PATH+="$(find_lib "*flexmark-util-misc*")$PSEP"
+  CLASS_PATH+="$(find_lib "*flexmark-util-format*")$PSEP"
+  CLASS_PATH+="$(find_lib "*flexmark-util-sequence*")$PSEP"
+  CLASS_PATH+="$(find_lib "*flexmark-util-builder*")$PSEP"
+  CLASS_PATH+="$(find_lib "*flexmark-util-collection*")$PSEP"
+  CLASS_PATH+="$(find_lib "*flexmark-util-visitor*")$PSEP"
+  CLASS_PATH+="$(find_lib "*flexmark-util-html*")$PSEP"
   CLASS_PATH+="$(find_lib "*liqp*")$PSEP"
   CLASS_PATH+="$(find_lib "*jsoup*")$PSEP"
   CLASS_PATH+="$(find_lib "*jackson-dataformat-yaml*")$PSEP"
@@ -129,14 +136,14 @@ echo "----------"
 echo $jvm_cp_args | grep tables
 echo "----------"
 
-# eval "\"$JAVACMD\"" \
-#      ${JAVA_OPTS:-$default_java_opts} \
-#      "${java_args[@]}" \
-#      "${jvm_cp_args-}" \
-#       -Dscala.usejavacp=true \
-#      "dotty.tools.scaladoc.Main"  \
-#      "${scala_args[@]}" \
-#      "${residual_args[@]}" \
-#      "${scripting_string-}"
-# scala_exit_status=$?
-# onExit
+eval "\"$JAVACMD\"" \
+     ${JAVA_OPTS:-$default_java_opts} \
+     "${java_args[@]}" \
+     "${jvm_cp_args-}" \
+      -Dscala.usejavacp=true \
+     "dotty.tools.scaladoc.Main"  \
+     "${scala_args[@]}" \
+     "${residual_args[@]}" \
+     "${scripting_string-}"
+scala_exit_status=$?
+onExit

project/Dependencies.scala

@@ -23,6 +23,7 @@ object Dependencies {
     "com.vladsch.flexmark" % "flexmark-ext-emoji" % flexmarkVersion,
     "com.vladsch.flexmark" % "flexmark-ext-gfm-strikethrough" % flexmarkVersion,
     "com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % flexmarkVersion,
+    "com.vladsch.flexmark" % "flexmark-ext-gfm-tables" % "0.50.50",
     "com.vladsch.flexmark" % "flexmark-ext-wikilink" % flexmarkVersion,
     "com.vladsch.flexmark" % "flexmark-ext-tables" % flexmarkVersion,
     "com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % flexmarkVersion,

project/scripts/cmdScaladocTests

@@ -1,31 +1,5 @@
 #!/usr/bin/env bash
 
-# Try to autodetect real location of the script
-if [ -z "${PROG_HOME-}" ] ; then
-  ## resolve links - $0 may be a link to PROG_HOME
-  PRG="$0"
-
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG="`dirname "$PRG"`/$link"
-    fi
-  done
-
-  saveddir=`pwd`
-
-  PROG_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  PROG_HOME=`cd "$PROG_HOME" && pwd`
-
-  cd "$saveddir"
-fi
-
 source $(dirname $0)/cmdTestsCommon.inc.sh
 
 echo "testing scaladoc script"
@@ -47,11 +21,11 @@ SOURCE_LINKS_VERSION="${GITHUB_SHA:-$DOTTY_BOOTSTRAPPED_VERSION}"
 
 "$SBT" "scaladoc/generateTestcasesDocumentation" > "$tmp" 2>&1 || echo "generated testcases project with sbt"
 
-source "$saveddir/dist/target/pack/bin/scaladoc"
+echo bonjour
+ls "$tmp"
 
 dist/target/pack/bin/scaladoc \
   -d "$OUT1" \
-  $jvm_cp_args \
   -project "scaladoc testcases" \
   -source-links:out/bootstrap/stdlib-bootstrapped/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/src_managed/main/scala-library-src=github://scala/scala/v"${STDLIB_VERSION}"#src/library \
   -source-links:out/bootstrap/stdlib-bootstrapped/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/src_managed/main/dotty-library-src=github://"${SOURCE_LINKS_REPOSITORY}"/"${SOURCE_LINKS_VERSION}"\#library/src \

scaladoc/src/dotty/tools/scaladoc/tasty/comments/MarkdownParser.scala

@@ -11,6 +11,7 @@ import com.vladsch.flexmark.util.sequence.CharSubSequence
 import com.vladsch.flexmark.parser.ParserEmulationProfile
 import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension
 import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension
+import com.vladsch.flexmark.ext.gfm.tables.TablesExtension
 import com.vladsch.flexmark.ext.emoji.EmojiExtension
 import com.vladsch.flexmark.ext.autolink.AutolinkExtension
 import com.vladsch.flexmark.ext.anchorlink.AnchorLinkExtension
@@ -19,7 +20,7 @@ import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension
 
 import scala.jdk.CollectionConverters._
 import com.vladsch.flexmark.util.misc.Extension
-import com.vladsch.flexmark.ext.tables.TablesExtension
+// import com.vladsch.flexmark.ext.tables.TablesExtension
 import com.vladsch.flexmark.util.data.MutableDataSet
 import com.vladsch.flexmark.util.data.DataHolder