Fixes nim-lang#12767 (nim-lang#12768)

alehander92 · Dec 2, 2019 · 3cf73b6 · 3cf73b6
1 parent c7db8e3
commit 3cf73b6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/compiler/options.nim b/compiler/options.nim
@@ -549,9 +549,11 @@ proc removeTrailingDirSep*(path: string): string =
 proc disableNimblePath*(conf: ConfigRef) =
   incl conf.globalOptions, optNoNimblePath
   conf.lazyPaths.setLen(0)
+  conf.nimblePaths.setLen(0)
 
 proc clearNimblePath*(conf: ConfigRef) =
   conf.lazyPaths.setLen(0)
+  conf.nimblePaths.setLen(0)
 
 include packagehandling
 

diff --git a/tests/nimble/tnimblepathdollar.nims b/tests/nimble/tnimblepathdollar.nims
@@ -1,5 +1,5 @@
+switch("clearNimblePath")
 switch("nimblePath", "$projectdir/nimbleDir/simplePkgs")
 switch("path", "$nimblepath/pkgA-0.1.0")
 switch("path", "$nimblepath/pkgB-#head")
 switch("path", "$nimblepath/pkgC-#head")
-switch("noNimblePath")
diff --git a/tests/nimble/tnimblepathdollarfail.nim b/tests/nimble/tnimblepathdollarfail.nim
@@ -0,0 +1,10 @@
+discard """
+  errmsg: "cannot open file: pkgA/module"
+"""
+import pkgA/module as A
+import pkgB/module as B
+import pkgC/module as C
+
+doAssert pkgATest() == 1, "Simple pkgA-0.1.0 wasn't added to path correctly."
+doAssert pkgBTest() == 0xDEADBEEF, "pkgB-#head wasn't picked over pkgB-0.1.0"
+doAssert pkgCTest() == 0xDEADBEEF, "pkgC-#head wasn't picked over pkgC-#aa11"
diff --git a/tests/nimble/tnimblepathdollarfail.nims b/tests/nimble/tnimblepathdollarfail.nims
@@ -0,0 +1,5 @@
+switch("noNimblePath")
+switch("nimblePath", "$projectdir/nimbleDir/simplePkgs")
+switch("path", "$nimblepath/pkgA-0.1.0")
+switch("path", "$nimblepath/pkgB-#head")
+switch("path", "$nimblepath/pkgC-#head")