Skip to content
This repository has been archived by the owner on Jul 15, 2023. It is now read-only.

Fix internal package import #1535

Merged
merged 3 commits into from
Feb 28, 2018
Merged

Fix internal package import #1535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c34e5a
Fix internal package import
uudashr Feb 23, 2018
7bdc010
Fix for windows
uudashr Feb 28, 2018
8232fd8
travis ci use golang 1.10.x
uudashr Feb 28, 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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff 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
2 changes: 1 addition & 1 deletion src/goPackages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}