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.

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

Write hie info #3708

Merged
merged 2 commits into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ dist
stack.yaml.lock
.hlint*
.envrc
.hie

# Drasil supported programming languages
__pycache__
Expand Down
7 changes: 4 additions & 3 deletions code/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -492,16 +492,17 @@ deploy: analysis graphs convertAnalyzed packagedeps docs tex doxygen ##@Deploy G

# Removes all generated folders.
$(filter $(CLEAN_GF_PREFIX)%, $(CLEAN_FOLDERS)): $(CLEAN_GF_PREFIX)%:
- rm -rf "./$*/"
rm -rf "./$*/"
JacquesCarette marked this conversation as resolved.
Show resolved Hide resolved

clean_artifacts: $(CLEAN_FOLDERS) ##@Cleaning Remove generated artifacts & folders. (alt.: cleanArtifacts)
- rm -f "$(CACHED_MSV_FILE)"
rm -f "./$(CACHED_MSV_FILE)"

# TODO: HELP_FUN's pattern match ignores targets with aliases, this is a temporary exterior alias until we fix it.
cleanArtifacts: clean_artifacts

clean: clean_artifacts ##@Cleaning Fully clean all generated builds, artifacts, & folders.
- stack clean
find . -type d -name '.hie' -exec rm -rf {} +
stack clean

#--------------------------#
#--- Help & Information ---#
Expand Down
37 changes: 29 additions & 8 deletions code/hie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,30 @@ cradle:
- path: "drasil-code/lib"
component: "drasil-code:lib"

- path: "drasil-code/test"
- path: "drasil-code/test/Main.hs"
component: "drasil-code:exe:codegenTest"


- path: "drasil-code/test/FileTests.hs"
component: "drasil-code:exe:codegenTest"

- path: "drasil-code/test/HelloWorld.hs"
component: "drasil-code:exe:codegenTest"

- path: "drasil-code/test/Helper.hs"
component: "drasil-code:exe:codegenTest"

- path: "drasil-code/test/Observer.hs"
component: "drasil-code:exe:codegenTest"

- path: "drasil-code/test/PatternTest.hs"
component: "drasil-code:exe:codegenTest"

- path: "drasil-code/test/VectorTest.hs"
component: "drasil-code:exe:codegenTest"

- path: "drasil-code/test/NameGenTest.hs"
component: "drasil-code:exe:codegenTest"

- path: "drasil-codeLang/lib"
component: "drasil-codeLang:lib"

Expand Down Expand Up @@ -45,12 +66,6 @@ cradle:
- path: "drasil-example/hghc/app/Main.hs"
component: "hghc:exe:hghc"

- path: "drasil-example/swhsnopcm/lib"
component: "swhsnopcm:lib"

- path: "drasil-example/swhsnopcm/app/Main.hs"
component: "swhsnopcm:exe:swhsnopcm"

- path: "drasil-example/pdcontroller/lib"
component: "pdcontroller:lib"

Expand Down Expand Up @@ -81,6 +96,12 @@ cradle:
- path: "drasil-example/swhs/app/Main.hs"
component: "swhs:exe:swhs"

- path: "drasil-example/swhsnopcm/lib"
component: "swhsnopcm:lib"

- path: "drasil-example/swhsnopcm/app/Main.hs"
component: "swhsnopcm:exe:swhsnopcm"

- path: "drasil-example/template/lib"
component: "template:lib"

Expand Down
3 changes: 3 additions & 0 deletions code/stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
resolver:
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/20.yaml

ghc-options:
"$everything": -fwrite-ide-info -hiedir=.hie

# User packages to be built.
# Various formats can be used as shown in the example below.
#
Expand Down
Loading