Skip to content

Miscellaneous WIP and/or hacky tree styling changes #980

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

Closed
georgefst wants to merge 9 commits into from
Closed

Miscellaneous WIP and/or hacky tree styling changes #980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b4943b4
rename type var
georgefst Jun 10, 2023
0fb6fce
render types as square and terms as round
georgefst Jun 10, 2023
97005a5
colour all nodes/flavors
georgefst Jun 10, 2023
99c6d3d
display no text on hole nodes
georgefst Jun 10, 2023
b3cfbe9
display longer name for case nodes
georgefst Jun 10, 2023
7517c6b
use left arrows for all sorts of application
georgefst Jun 10, 2023
93e5750
Revert "display longer name for case nodes"
georgefst Jun 10, 2023
f67c55a
hacky fix for hole rendering in beginner mode
georgefst Jun 10, 2023
7c97307
remove pattern node labels
georgefst Jun 10, 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
186 changes: 118 additions & 68 deletions src/components/TreeReactFlow/Flavor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ export const flavorClasses = (flavor: NodeFlavor): string => {
);
case "APP":
return classNames(
"border-yellow-secondary ring-yellow-secondary bg-yellow-secondary",
"hover:ring-yellow-secondary",
"border-blue-tertiary ring-blue-tertiary bg-blue-tertiary",
"hover:ring-blue-tertiary",
commonHoverClasses
);
case "Con":
Expand Down Expand Up @@ -79,8 +79,8 @@ export const flavorClasses = (flavor: NodeFlavor): string => {
);
case "LAM":
return classNames(
"border-black-primary ring-black-primary bg-white-primary",
"hover:ring-black-primary",
"border-blue-secondary ring-blue-secondary bg-white-primary",
"hover:ring-blue-secondary",
commonHoverClasses
);
case "GlobalVar":
Expand Down Expand Up @@ -126,56 +126,56 @@ export const flavorClasses = (flavor: NodeFlavor): string => {

case "PrimCon":
return classNames(
"border-black-primary ring-black-primary bg-white-primary",
"hover:ring-black-primary",
"border-green-primary ring-green-primary bg-white-primary",
"hover:ring-green-primary",
commonHoverClasses
);
case "TEmptyHole":
return classNames(
"border-black-primary ring-black-primary bg-white-primary",
"hover:ring-black-primary",
"border-red-tertiary ring-red-tertiary bg-white-primary",
"hover:ring-red-tertiary",
commonHoverClasses
);
case "THole":
return classNames(
"border-black-primary ring-black-primary bg-white-primary",
"hover:ring-black-primary",
"border-red-tertiary ring-red-tertiary bg-white-primary",
"hover:ring-red-tertiary",
commonHoverClasses
);
case "TCon":
return classNames(
"border-black-primary ring-black-primary bg-white-primary",
"hover:ring-black-primary",
"border-green-primary ring-green-primary bg-white-primary",
"hover:ring-green-primary",
commonHoverClasses
);
case "TFun":
return classNames(
"border-black-primary ring-black-primary bg-black-primary",
"hover:ring-black-primary",
"border-blue-primary ring-blue-primary bg-blue-primary",
"hover:ring-blue-primary",
commonHoverClasses
);
case "TVar":
return classNames(
"border-black-primary ring-black-primary bg-white-primary",
"hover:ring-black-primary",
"border-blue-quaternary ring-blue-quaternary bg-white-primary",
"hover:ring-blue-quaternary",
commonHoverClasses
);
case "TApp":
return classNames(
"border-black-primary ring-black-primary bg-black-primary",
"hover:ring-black-primary",
"border-blue-tertiary ring-blue-tertiary bg-blue-tertiary",
"hover:ring-blue-tertiary",
commonHoverClasses
);
case "TForall":
return classNames(
"border-black-primary ring-black-primary bg-white-primary",
"hover:ring-black-primary",
"border-blue-secondary ring-blue-secondary bg-white-primary",
"hover:ring-blue-secondary",
commonHoverClasses
);
case "TLet":
return classNames(
"border-black-primary ring-black-primary bg-black-primary",
"hover:ring-black-primary",
"border-blue-quaternary ring-blue-quaternary bg-blue-quaternary",
"hover:ring-blue-quaternary",
commonHoverClasses
);

Expand All @@ -190,7 +190,7 @@ export const flavorClasses = (flavor: NodeFlavor): string => {
case "PatternCon":
return "border-green-primary ring-green-primary bg-white-primary";
case "PrimPattern":
return "border-black-primary ring-black-primary bg-white-primary";
return "border-green-primary ring-green-primary bg-white-primary";
case "PatternWildcard":
return "border-none bg-transparent";
case "PatternBind":
Expand Down Expand Up @@ -227,7 +227,7 @@ export const flavorContentClasses = (
case "Lam":
return "text-blue-primary";
case "LAM":
return "text-blue-primary";
return "text-blue-secondary";
case "GlobalVar":
return "text-blue-primary";
case "LocalVar":
Expand Down Expand Up @@ -257,7 +257,7 @@ export const flavorContentClasses = (
case "TApp":
return "text-white-primary";
case "TForall":
return "text-blue-primary";
return "text-blue-secondary";
case "TLet":
return "text-white-primary";
case "PatternCon":
Expand All @@ -277,25 +277,25 @@ export const flavorContentClasses = (
export const flavorLabelClasses = (flavor: NodeFlavor): string => {
switch (flavor) {
case "Hole":
return "font-code bg-red-tertiary border-red-tertiary text-white-primary";
return "";
case "EmptyHole":
return "font-code bg-red-tertiary border-red-tertiary text-white-primary";
return "";
case "Ann":
return "font-code bg-black-primary border-black-primary text-white-primary";
case "App":
return "font-code bg-blue-tertiary border-blue-tertiary text-white-primary";
case "APP":
return "font-code bg-yellow-secondary border-yellow-secondary text-white-primary";
return "font-code bg-blue-tertiary border-blue-tertiary text-white-primary";
case "Con":
return "bg-green-primary border-green-primary text-white-primary";
case "Lam":
return "font-code bg-blue-primary border-blue-primary text-white-primary";
case "LAM":
return "font-code bg-black-primary border-black-primary text-white-primary";
return "font-code bg-blue-secondary border-blue-secondary text-white-primary";
case "GlobalVar":
return "bg-blue-quaternary border-blue-quaternary text-white-primary";
case "KHole":
return "font-code bg-red-tertiary border-red-tertiary text-white-primary";
return "";
case "KType":
return "font-code bg-grey-tertiary bg-grey-tertiary text-white-primary";
case "KFun":
Expand All @@ -313,29 +313,29 @@ export const flavorLabelClasses = (flavor: NodeFlavor): string => {
case "CaseWith": // Special case: we hide this label.
return "hidden font-code bg-yellow-primary border-yellow-primary text-white-primary";
case "PrimCon":
return "bg-black-primary border-black-primary text-white-primary";
return "bg-green-primary border-green-primary text-white-primary";
case "TEmptyHole":
return "font-code bg-black-primary border-black-primary text-white-primary";
return "";
case "THole":
return "font-code bg-black-primary border-black-primary text-white-primary";
return "";
case "TCon":
return "bg-black-primary border-black-primary text-white-primary";
return "bg-green-primary border-green-primary text-white-primary";
case "TFun":
return "font-code bg-black-primary border-black-primary text-white-primary";
return "font-code bg-blue-primary border-blue-primary text-white-primary";
case "TVar":
return "bg-black-primary border-black-primary text-white-primary";
return "bg-blue-quaternary border-blue-quaternary text-white-primary";
case "TApp":
return "font-code bg-black-primary border-black-primary text-white-primary";
return "font-code bg-blue-tertiary border-blue-tertiary text-white-primary";
case "TForall":
return "font-code bg-black-primary border-black-primary text-white-primary";
return "font-code bg-blue-secondary border-blue-secondary text-white-primary";
case "TLet":
return "font-code bg-black-primary border-black-primary text-white-primary";
return "font-code bg-blue-quaternary border-blue-quaternary text-white-primary";
case "Pattern":
return "bg-yellow-primary border-yellow-primary text-white-primary";
return "";
case "PatternCon":
return "bg-green-primary border-green-primary text-white-primary";
case "PrimPattern":
return "bg-black-primary border-black-primary text-white-primary";
return "bg-green-primary border-green-primary text-white-primary";
case "PatternWildcard":
return "hidden";
case "PatternBind":
Expand All @@ -354,7 +354,7 @@ export const flavorEdgeClasses = (flavor: NodeFlavor): string => {
case "App":
return "stroke-blue-tertiary";
case "APP":
return "stroke-yellow-secondary";
return "stroke-blue-tertiary";
case "Con":
return "stroke-green-primary";
case "KHole":
Expand All @@ -366,7 +366,7 @@ export const flavorEdgeClasses = (flavor: NodeFlavor): string => {
case "Lam":
return "stroke-blue-primary";
case "LAM":
return "stroke-black-primary";
return "stroke-blue-secondary";
case "GlobalVar":
return "stroke-blue-quaternary";
case "LocalVar":
Expand All @@ -382,31 +382,31 @@ export const flavorEdgeClasses = (flavor: NodeFlavor): string => {
case "CaseWith":
return "stroke-yellow-primary";
case "PrimCon":
return "stroke-black-primary";
return "stroke-green-primary";
case "TEmptyHole":
return "stroke-black-primary";
return "stroke-red-tertiary";
case "THole":
return "stroke-black-primary";
return "stroke-red-tertiaryy";
case "TCon":
return "stroke-black-primary";
return "stroke-green-primary";
case "TFun":
return "stroke-black-primary";
return "stroke-blue-primary";
case "TVar":
return "stroke-black-primary";
return "stroke-blue-quaternary";
case "TApp":
return "stroke-black-primary";
return "stroke-blue-tertiary";
case "TForall":
return "stroke-black-primary";
return "stroke-blue-secondary";
case "TLet":
return "stroke-black-primary";
return "stroke-blue-quaternary";
case "Pattern":
return "stroke-yellow-primary";
case "PatternCon":
return "stroke-green-primary";
case "PrimPattern":
return "stroke-black-primary";
return "stroke-green-primary";
case "PatternWildcard":
return "stroke-black-primary";
return "stroke-grey-secondary";
case "PatternBind":
return "stroke-blue-quaternary";
}
Expand All @@ -415,15 +415,15 @@ export const flavorEdgeClasses = (flavor: NodeFlavor): string => {
export const flavorLabel = (flavor: NodeFlavor): string => {
switch (flavor) {
case "Hole":
return "{?}";
return "";
case "EmptyHole":
return "?";
return "";
case "Ann":
return ":";
case "App":
return "$";
return "←";
case "APP":
return "@";
return "←";
case "Con":
return "V";
case "Lam":
Expand All @@ -447,23 +447,23 @@ export const flavorLabel = (flavor: NodeFlavor): string => {
case "PrimCon":
return "V";
case "TEmptyHole":
return "?";
return "";
case "THole":
return "{?}";
return "";
case "TCon":
return "T";
case "TFun":
return "→";
case "TVar":
return "Var";
case "TApp":
return "@";
return "←";
case "TForall":
return "∀";
case "TLet":
return "let";
case "Pattern":
return "P";
Copy link
Copy Markdown
Member

@dhess dhess Jun 11, 2023

Choose a reason for hiding this comment

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

I was just playing with replacing this with "Pattern" — might as well be explicit about it at beginner level, and we have the space. I agree it could be dropped altogether at higher levels.

return "";
case "PatternCon":
return "V";
case "PrimPattern":
Expand All @@ -475,7 +475,7 @@ export const flavorLabel = (flavor: NodeFlavor): string => {
case "KType":
return "✱";
case "KHole":
return "?";
return "";
case "KFun":
return "➜";
}
Expand All @@ -498,19 +498,19 @@ export const noBodyFlavorContents = (flavor: NodeFlavorNoBody): string => {
case "TApp":
return "apply type";
case "Hole":
return "{?}";
return "";
case "EmptyHole":
return "?";
return "";
case "TEmptyHole":
return "?";
return "";
case "THole":
return "{?}";
return "";
case "PatternWildcard":
return "🤷🏽‍♀️";
case "KType":
return "type";
case "KHole":
return "?";
return "";
case "KFun":
return "type constructor";
}
Expand All @@ -522,3 +522,53 @@ export const boxFlavorBackground = (flavor: NodeFlavorBoxBody): string => {
return "bg-yellow-primary";
}
};

// TODO get from backend? this comes down to whether these are from `Expr` or `Type`
export const isTypeLevel = (flavor: NodeFlavor): "term" | "type" => {
switch (flavor) {
case "Con":
case "Lam":
case "LAM":
case "Let":
case "Letrec":
case "PatternBind":
case "PatternCon":
case "LetType":
case "GlobalVar":
case "LocalVar":
case "PrimCon":
case "Pattern":
case "Hole":
case "EmptyHole":
case "Ann":
case "App":
case "APP":
case "Case":
case "CaseWith":
case "PatternWildcard":
case "PrimPattern":
return "term";
case "TCon":
case "TVar":
case "TForall":
case "TLet":
case "TEmptyHole":
case "THole":
case "TFun":
case "TApp":
return "type";
// TODO separate rendering for kinds?
case "KFun":
case "KHole":
case "KType":
return "type";
}
};
export const typeOrTermClasses = (x: "term" | "type"): string => {
switch (x) {
case "term":
return "rounded-3xl";
case "type":
return "";
}
};
Loading