Fix internal package import (#1535)

* Fix internal package import * Fix for windows * travis ci use golang 1.10.x
microsoft · Feb 28, 2018 · 41c5b3b · 41c5b3b
1 parent 230e7bc
commit 41c5b3b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ go:
   - 1.7.x
   - 1.8.x
   - 1.9.x
-  - '1.10'
+  - 1.10.x
   - tip
 
 sudo: false

diff --git a/src/goPackages.ts b/src/goPackages.ts
@@ -238,7 +238,7 @@ export function isAllowToImportPackage(toDirPath: string, currentWorkspace: stri
 	let internalPkgFound = pkgPath.match(/\/internal\/|\/internal$/);
 	if (internalPkgFound) {
 		let rootProjectForInternalPkg = path.join(currentWorkspace, pkgPath.substr(0, internalPkgFound.index));
-		return toDirPath.startsWith(rootProjectForInternalPkg);
+		return toDirPath.startsWith(rootProjectForInternalPkg + path.sep) || toDirPath === rootProjectForInternalPkg;
 	}
 	return true;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ go: @@
       - 1.7.x
       - 1.8.x
       - 1.9.x
-      - '1.10'
+      - 1.10.x
       - tip
     sudo: false
@@ Expand Down @@