-
Notifications
You must be signed in to change notification settings - Fork 267
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.
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
remove FileCodebase and some weeds #2363
Merged
Merged
Commits on Aug 30, 2021
-
stripping and unknotting some stuff
- moved everything that depended on V1 `Reference` into `FileCodebase` namespace, duplicating a lot of code for better or worse. - pulled these into their own modules: - Codebase (types) into `Codebase.Type`; `Codebase` module re-exports them - `Codebase.Branch.Merge`, - `Codebase.Branch.Names` (Branch shouldn't depend on `Names`) - `Codebase.BuiltinAnnotation` - `Codebase.Causal.FoldHistory` - `Codebase.CodeLookup.Util` (remove `CodeLookup` dependency on `UnisonFile`) - `Codebase.DataDeclaration.ConstructorId` trying to use this alias in relevant places - `Codebase.Init` - `CodebasePath`, the `FilePath` alias. - `Lexer.Pos` (because `AnnotatedText`, `Range`, `Parser.Ann` shouldn't depend on the whole lexer) - `Names.ResolutionResult` (`Type` shouldn't depend on `Names`) - `PrettyPrintEnv.FQN` - `PrettyPrintEnv.Names` (pulled out references to `Names` from `PPE`) - `PPE.Util` not 100% sure what's happening here - `PrettyPrintEnvDecl` pull this data type and supporting functions into separate module - `Path.Parse` (`Path` shouldn't depend on the lexer) - `Path.Convert`, `Path.Parse` into `Unison.Util.Convert` - `Parser.Ann` (`Codebase`, etc. etc. shouldn't depend on `Parser`) - `Referent'` (`SyntaxText`/`ColorText` shouldn't depend on `Reference`) - `Referent` module re-exports stuff from `Referent'`, hard-coded to `Reference`. - removed `SyntaxText.SyntaxText` - `TermEdit.Typing` (because `TermEdit` shouldn't depend on the full typechecker) - `UnisonFile` / `TypecheckedUnisonFile` (types into `UnisonFile.Type`) - `UnisonFile.Env` - `UnisonFile.Error` - `UnisonFile.Names` - `Var.WatchKind` - `Var.refNamed` - Deleted unused `Codebase.Classes` typeclasses wip - Deleted unused `Unison.Util.Menu`, ancient modal stuff - Moved `Codebase.makeSelfContained` into `UnisonFile` module, since it deals with `UnisonFile` and not with `Codebase`. - split up `GitError` into a more codebase-agnostic hierarchy (see `Codebase.Type.GitError`) - changed `bindNames` to `bindReferences` in some cases; `bindNames` remains in `.Names` compatibility module - move `Unison.Var.refNamed` into `Unison.Term` - tweaked GitError to separate obviously codebase-format specific errors from non-obviously-corbase-format-specific errors. - tweaked `Reflog.Entry` to support anything that's coercible to `Unison.Hash`, but also changed its kind - removed `DebugBranchHistoryI` input because I didn't want to maintain its implementation - removed `ShortBranchHash` dependency on `Hash`, and let it work on anything coercible to `Hash`. P.S./todo This class should be called ShortHash; the existing ShortHash is really a ShortReference! - removed SyntaxText dependency on Reference - cleaned up `Path` somewhat - held off on: - move `DD.updateDependencies` - splitting up `Path` into the billion different components - e.g. `Path` becomes `RelativePath`, `Path'` becomes `Path`, and `Absolute` wraps `RelativePath` - `Split` / `Split'` maybe rename to `Path.NonEmpty`? - rename `Branch.getPatch` / `.getMaybePatch` - split out `Name.Parse`, `Name.Convert`, substitute a lot of specific functions like `Path.hqSplitFromName'` with `Convert.parse`. - todo: - clear unreferenced junk - restore: - `NameEdit`? - `PatternCompat`?
Configuration menu - View commit details
-
Copy full SHA for 2f13ea1 - Browse repository at this point
Copy the full SHA 2f13ea1View commit details -
Configuration menu - View commit details
-
Copy full SHA for b273199 - Browse repository at this point
Copy the full SHA b273199View commit details -
Merge remote-tracking branch 'origin/trunk' into topic/weed-codebase1-5
# Conflicts: # parser-typechecker/src/Unison/Codebase.hs # parser-typechecker/src/Unison/Codebase/Editor/HandleCommand.hs # parser-typechecker/src/Unison/PrettyPrintEnv.hs # parser-typechecker/unison/Main.hs # unison-core/src/Unison/Names3.hs # unison-core/src/Unison/Pattern.hs # unison-core/src/Unison/Term.hs # unison-core/src/Unison/Type.hs # unison-core/src/Unison/Util/Relation.hs # unison-core/unison-core1.cabal
Configuration menu - View commit details
-
Copy full SHA for 5dc190c - Browse repository at this point
Copy the full SHA 5dc190cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9d6d007 - Browse repository at this point
Copy the full SHA 9d6d007View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0ce117e - Browse repository at this point
Copy the full SHA 0ce117eView commit details -
Configuration menu - View commit details
-
Copy full SHA for f52397b - Browse repository at this point
Copy the full SHA f52397bView commit details -
Configuration menu - View commit details
-
Copy full SHA for f7746a4 - Browse repository at this point
Copy the full SHA f7746a4View commit details
Commits on Aug 31, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 81a32fc - Browse repository at this point
Copy the full SHA 81a32fcView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4346f57 - Browse repository at this point
Copy the full SHA 4346f57View commit details -
Configuration menu - View commit details
-
Copy full SHA for a2e5895 - Browse repository at this point
Copy the full SHA a2e5895View commit details
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.