This repository was archived by the owner on Aug 25, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 94
Support setting and using namespaces #8
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,6 +39,8 @@ final class CodegenFile { | |
| private ?Map<string, Vector<string>> $rekey = null; | ||
| private bool $createOnly = false; | ||
| private ?ICodegenFormatter $formatter; | ||
| private ?string $fileNamespace; | ||
| private Map<string, ?string> $useNamespaces = Map {}; | ||
|
|
||
| public function __construct( | ||
| private IHackCodegenConfig $config, | ||
|
|
@@ -270,6 +272,15 @@ public function setDoClobber(bool $do_force): this { | |
|
|
||
| private function getContent(): string { | ||
| $builder = hack_builder(); | ||
| $builder->addLineIf( | ||
| $this->fileNamespace !== null, | ||
| 'namespace %s;', | ||
| $this->fileNamespace, | ||
| ); | ||
| foreach ($this->useNamespaces as $ns => $as) { | ||
| $builder->addLine($as === null ? "use $ns;" : "use $ns as $as;"); | ||
| } | ||
|
|
||
| foreach ($this->beforeTypes as $type) { | ||
| $builder->ensureNewLine()->newLine(); | ||
| $builder->add($type->render()); | ||
|
|
@@ -330,6 +341,33 @@ public function setGeneratedFrom( | |
| return $this; | ||
| } | ||
|
|
||
| public function setNamespace(string $file_namespace): this { | ||
| invariant($this->fileNamespace === null, 'namespace has already been set'); | ||
| $this->fileNamespace = $file_namespace; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Check that it's not already set |
||
| return $this; | ||
| } | ||
|
|
||
| public function useNamespace(string $ns, ?string $as = null): this { | ||
| invariant( | ||
| !$this->useNamespaces->contains($ns), | ||
| $ns.' is already being used', | ||
| ); | ||
| $this->useNamespaces[$ns] = $as; | ||
| return $this; | ||
| } | ||
|
|
||
| public function useClass(string $ns, ?string $as = null): this { | ||
| return $this->useNamespace($ns, $as); | ||
| } | ||
|
|
||
| public function useFunction(string $ns, ?string $as = null): this { | ||
| return $this->useNamespace('function '.$ns, $as); | ||
| } | ||
|
|
||
| public function useConst(string $ns, ?string $as = null): this { | ||
| return $this->useNamespace('const '.$ns, $as); | ||
| } | ||
|
|
||
| /** | ||
| * If called, save() will only write the file if it doesn't exist | ||
| */ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Map is actually better.