Skip to content
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

Jump to bottom

fix(go): shorten file names for sub-packages #3927

Merged
merged 7 commits into from
Feb 3, 2023
Merged

fix(go): shorten file names for sub-packages #3927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5ff6c7b
fix(go): shorten file names for sub-packages
DanielMSchmidt Jan 25, 2023
b6b28bb
chore: switch to JDK-19-compatible Mockito release
RomainMuller Feb 3, 2023
5549e5d
chore: upgrade mypy to Python-3.10-compatible
RomainMuller Feb 3, 2023
aa36ae6
Update snapshots
RomainMuller Feb 3, 2023
3f99eb8
Revert dotnet snapshot cleanly
RomainMuller Feb 3, 2023
4ee91e1
Revert dotnet snapshot cleanly (on the correct hash this time)
RomainMuller Feb 3, 2023
3d1431f
revert mypy version change
RomainMuller Feb 3, 2023
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 packages/@jsii/java-runtime/pom.xml.t.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ process.stdout.write(`<?xml version="1.0" encoding="UTF-8"?>
<javax-annotations.version>[1.3.2,1.4.0)</javax-annotations.version>
<jetbrains-annotations.version>[13.0.0,24.0-a0)</jetbrains-annotations.version>
<junit.version>[5.8.0,5.10-a0)</junit.version>
<mockito.version>[3.12.4,4.0-a0)</mockito.version>
<mockito.version>[4.11.0,5.0-a0)</mockito.version>
</properties>

<dependencies>
Expand Down
25 changes: 4 additions & 21 deletions packages/jsii-pacmak/lib/targets/go/package.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ export abstract class Package {
if (this.types.length > 0) {
const { code } = context;

const initFile = join(this.directory, `${this.packageName}.go`);
const initFile = join(this.directory, `main.go`);
code.openFile(initFile);
code.line(`package ${this.packageName}`);
code.line();
Expand Down Expand Up @@ -238,10 +238,7 @@ export abstract class Package {

private emitTypes(context: EmitContext) {
for (const type of this.types) {
const filePath = join(
this.directory,
`${this.packageName}_${type.name}.go`,
);
const filePath = join(this.directory, `${type.name}.go`);
context.code.openFile(filePath);

this.emitHeader(context.code);
Expand All @@ -266,23 +263,9 @@ export abstract class Package {
return;
}

emit.call(
this,
join(
this.directory,
`${this.packageName}_${type.name}__runtime_type_checks.go`,
),
false,
);
emit.call(this, join(this.directory, `${type.name}__checks.go`), false);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this not risk collisions if two namespaces have the same leaf type name?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, they are in nested folders


emit.call(
this,
join(
this.directory,
`${this.packageName}_${type.name}__no_runtime_type_checking.go`,
),
true,
);
emit.call(this, join(this.directory, `${type.name}__no_checks.go`), true);

function emit(this: Package, filePath: string, forNoOp: boolean) {
code.openFile(filePath);
Expand Down
Loading