Skip to content

Fix path separator in fromtasty.Debug #5452

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.

Sign up for GitHub

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

Merged
allanrenucci merged 21 commits into from
Nov 21, 2018
Merged

Fix path separator in fromtasty.Debug #5452

Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
72ef612
fix exception 'UnmappableCharacterException' in dottydoc on Windows
Nov 12, 2018
0f94c25
add batch scripts to build Dotty distro on Windows
Nov 12, 2018
36f6108
small improvements in batch scripts for Dotty 0.10
Nov 13, 2018
0717827
improved subcommands in build.bat
Nov 13, 2018
4e57388
move batch scripts for distro to correct directory
Nov 13, 2018
728cdff
fix goto label and help handling in batch scripts
Nov 13, 2018
52a4766
added batch scripts for sbt pack
Nov 13, 2018
89437fb
remove debug code
Nov 14, 2018
d30ef54
Merge branch 'master' of https://github.com/lampepfl/dotty
Nov 14, 2018
3455189
improved error messages in batch scripts
michelou Nov 14, 2018
28b4c04
reverted commits up to 72ef612 (PR #5430)
michelou Nov 14, 2018
6688ea6
added batch scripts for a new PR
michelou Nov 14, 2018
205fab5
removed debug code from batch scripts
michelou Nov 14, 2018
a6df702
added compile subcommand to batch script
michelou Nov 14, 2018
6a06639
Fix path separator on Windows
michelou Nov 16, 2018
37f6dd0
Revert "removed debug code from batch scripts"
michelou Nov 21, 2018
c605b19
Revert "added batch scripts for a new PR"
michelou Nov 21, 2018
6ddea04
Revert "added compile subcommand to batch script"
michelou Nov 21, 2018
f8432e2
revert
michelou Nov 21, 2018
c673a7d
revert
michelou Nov 21, 2018
6da36fc
Revert "fix exception 'UnmappableCharacterException' in dottydoc on W…
michelou Nov 21, 2018
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
3 changes: 2 additions & 1 deletion compiler/src/dotty/tools/dotc/fromtasty/Debug.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import scala.util.control.NonFatal

import dotty.tools.io.Directory

import java.io.{File => JFile}
import java.nio.file.{Files, Paths}

object Debug {
Expand Down Expand Up @@ -65,7 +66,7 @@ object Debug {

private def insertClasspathInArgs(args: List[String], cp: String): List[String] = {
val (beforeCp, fromCp) = args.span(_ != "-classpath")
val classpath = fromCp.drop(1).headOption.fold(cp)(_ + ":" + cp)
val classpath = fromCp.drop(1).headOption.fold(cp)(_ + JFile.pathSeparator + cp)
"-classpath" :: classpath :: beforeCp ::: fromCp.drop(2)
}
}