Skip to content

Commit 6f84b8a

Browse files
wdanilowdanilo
committed
Merge branch 'master' of github.com:luna/enso
2 parents e777135 + e91df35 commit 6f84b8a

23 files changed

+7024
-10
lines changed

‎.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
---
2+
name: Bug Report
3+
about: Report a bug in Enso.
4+
title: ''
5+
labels: 'Type: Bug'
6+
assignees: ''
7+
8+
---
9+
10+
<!--
11+
Please ensure that you are running the latest version of Enso before reporting
12+
the bug! It may have been fixed since.
13+
-->
14+
15+
### General Summary
16+
<!--
17+
- Please include a high-level description of your bug here.
18+
-->
19+
20+
### Steps to Reproduce
21+
<!--
22+
Please list the reproduction steps for your bug. For example:
23+
24+
1. Launch the enso interpreter in server mode `enso --server --socket:8080`.
25+
2. Send it a message as follows, where `path/to/project` doesn't exist.
26+
27+
```json
28+
{
29+
message-type: "load-project",
30+
load-project: {
31+
path: "path/to/project"
32+
}
33+
...
34+
}
35+
```
36+
3. Observe that the compiler crashes.
37+
-->
38+
39+
### Expected Result
40+
<!--
41+
- A description of the results you expected from the reproduction steps.
42+
-->
43+
44+
### Actual Result
45+
<!--
46+
- A description of what actually happens when you run these steps.
47+
- Please include any error output if relevant.
48+
-->
49+
50+
### Luna Version
51+
<!--
52+
- Please include the output of `enso --version`.
53+
-->

‎.github/ISSUE_TEMPLATE/epic.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
name: Epic
3+
about: Create a new epic for Enso development.
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
### Summary
11+
<!--
12+
- This section should summarise the work we want to accomplish during the epic.
13+
-->
14+
15+
### Value
16+
<!--
17+
- A description of the value this epic brings to users.
18+
- The motivation behind this epic.
19+
-->
20+
21+
### Specification
22+
<!--
23+
- The high-level requirements of the epic.
24+
- Any performance requirements for the epic.
25+
-->
26+
27+
### Acceptance Criteria & Test Cases
28+
<!--
29+
- The high-level acceptance criteria for the epic.
30+
- The test plan for the epic.
31+
-->

‎.github/ISSUE_TEMPLATE/feature-request.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: Feature Request
3+
about: Request a new feature in Enso.
4+
title: ''
5+
labels: 'Type: Enhancement'
6+
assignees: ''
7+
8+
---
9+
10+
<!--
11+
Please ensure that you check the latest version of Enso to see if your feature
12+
has been implemented.
13+
-->
14+
15+
### General Summary
16+
<!--
17+
- Describe the feature you are requesting.
18+
-->
19+
20+
### Motivation
21+
<!--
22+
- A description of the motivation for adding this feature to Enso.
23+
- Ideally this would include use-cases that support the feature.
24+
-->

‎.github/ISSUE_TEMPLATE/task.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
name: Task
3+
about: Create a new development task for Enso.
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
### Summary
11+
<!--
12+
- A summary of the task.
13+
-->
14+
15+
### Value
16+
<!--
17+
- This section should describe the value of this task.
18+
- This value can be for users, to the team, etc.
19+
-->
20+
21+
### Specification
22+
<!--
23+
- Detailed requirements for the feature.
24+
- The performance requirements for the feature.
25+
-->
26+
27+
### Acceptance Criteria & Test Cases
28+
<!--
29+
- Any criteria that must be satisfied for the task to be accepted.
30+
- The test plan for the feature, related to the acceptance criteria.
31+
-->

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
### Pull Request Description
2+
<!--
3+
- Please describe the nature of your PR here, as well as the motivation for it.
4+
- If it fixes an open issue, please mention that issue number here.
5+
-->
6+
7+
### Important Notes
8+
<!--
9+
- Mention important elements of the design.
10+
- Mention any notable changes to APIs.
11+
-->
12+
13+
### Checklist
14+
Please include the following checklist in your PR:
15+
16+
- [ ] The documentation has been updated if necessary.
17+
- [ ] The code conforms to the [Scala](https://github.com/luna/enso/blob/master/doc/scala-style-guide.md) or [Haskell](https://github.com/luna/enso/blob/master/doc/haskell-style-guide.md) style guides as appropriate.
18+
- [ ] The code has been tested where possible.
19+

‎.gitignore

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,56 @@
1+
2+
###########
3+
## Scala ##
4+
###########
5+
16
target/
7+
*.class
8+
*.log
9+
10+
#############
11+
## Haskell ##
12+
#############
13+
14+
dist
15+
cabal-dev
16+
*.o
17+
*.hi
18+
*.chi
19+
*.chs.h
20+
*.dyn_o
21+
*.dyn_hi
22+
.hpc
23+
.hsenv
24+
.cabal-sandbox/
25+
cabal.sandbox.config
26+
*.cabal
27+
*.prof
28+
*.aux
29+
*.hp
30+
*.DS_Store
31+
.stack-work/
32+
33+
############
34+
## System ##
35+
############
36+
37+
# OSX
38+
.DS_Store
39+
40+
############
41+
## Images ##
42+
############
43+
44+
*.jpg
45+
*.jpeg
46+
*.png
47+
*.bmp
48+
*.psd
49+
50+
######################
51+
## Tooling Specific ##
52+
######################
53+
254
.idea/
55+
*.swp
56+
.projections.json

‎.scalafmt.conf

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
// Scala Formatting Configuration
2+
3+
// All Scala files should be reformatted through this formatter before being
4+
// committed to the repositories.
5+
6+
version = "2.0.0-RC8"
7+
8+
// Wrapping and Alignment
19
align = most
2-
maxColumn = 80
3-
assumeStandardLibraryStripMargin = true
4-
continuationIndent.defnSite = 2
5-
newlines.alwaysBeforeTopLevelStatements = true
10+
align.openParenCallSite = false
11+
align.openParenDefnSite = false
612
align.tokens = [
713
{code = "=>", owner = "Case"}
814
{code = "%", owner = "Term.ApplyInfix"}
@@ -12,9 +18,36 @@ align.tokens = [
1218
{code = "extends"}
1319
{code = ":", owner = "Defn.Def"}
1420
]
21+
maxColumn = 80
22+
verticalAlignMultilineOperators = true
23+
24+
// Comments and Documentation
25+
docstrings = "scaladoc"
26+
27+
// Indentation
28+
assumeStandardLibraryStripMargin = true
29+
continuationIndent.callSite = 2
30+
continuationIndent.defnSite = 2
31+
32+
// Newlines
33+
newlines.alwaysBeforeElseAfterCurlyIf = true
34+
newlines.alwaysBeforeTopLevelStatements = true
35+
36+
// Rewrite Rules
1537
rewrite.rules = [
16-
ExpandImportSelectors
17-
RedundantParens
18-
SortModifiers
19-
PreferCurlyFors
20-
]
38+
ExpandImportSelectors,
39+
PreferCurlyFors,
40+
RedundantParens,
41+
SortModifiers,
42+
]
43+
rewrite.sortModifiers.order = [
44+
"implicit", "final", "sealed", "abstract",
45+
"override", "private", "protected", "lazy"
46+
]
47+
48+
// Multiline Configuration
49+
verticalMultiline.atDefnSite = true
50+
verticalMultiline.arityThreshold = 4
51+
52+
// Please remember that `//format: off` and `//format: on` directives should be
53+
// used sparingly, if at all.

‎CODE_OF_CONDUCT.md

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
# The Enso Code of Conduct
2+
3+
## Conduct
4+
5+
**Contact**: [[email protected]](mailto:[email protected])
6+
7+
- We are committed to providing a friendly, safe and welcoming environment for
8+
all, regardless of level of experience, gender identity and expression, sexual
9+
orientation, disability, personal appearance, body size, race, ethnicity, age,
10+
religion, nationality, or other similar characteristic.
11+
- On Discord, please avoid using overtly sexual nicknames or other nicknames
12+
that might detract from a friendly, safe and welcoming environment for all.
13+
- Please be kind and courteous. There's no need to be mean or rude.
14+
- Respect that people have differences of opinion and that every design or
15+
implementation choice carries a trade-off and numerous costs. There is seldom
16+
a right answer.
17+
- Please keep unstructured critique to a minimum. If you have solid ideas you
18+
want to experiment with, make a fork and see how it works.
19+
- We will exclude you from interaction if you insult, demean or harass anyone.
20+
That is not welcome behaviour. We interpret the term "harassment" as including
21+
the definition in the
22+
[Citizen Code of Conduct](http://citizencodeofconduct.org/); if you have any
23+
lack of clarity about what might be included in that concept, please read
24+
their definition. In particular, we don't tolerate behaviour that excludes
25+
people in socially marginalized groups.
26+
- Private harassment is also unacceptable. No matter who you are, if you feel
27+
you have been or are being harassed or made uncomfortable by a community
28+
member, please contact one of the moderators or any of the
29+
[Enso moderation team][mod_team] immediately. Whether you're a regular
30+
contributor or a newcomer, we care about making this community a safe place
31+
for you and we've got your back.
32+
- Likewise any spamming, trolling, flaming, baiting or other attention-stealing
33+
behaviour is not welcome.
34+
35+
## Moderation
36+
These are the policies for upholding our community's standards of conduct. If
37+
you feel that a thread needs moderation, please contact the
38+
[Enso moderation team][mod_team].
39+
40+
1. Remarks that violate the Enso standards of conduct, including hateful,
41+
hurtful, oppressive, or exclusionary remarks, are not allowed. Cursing is
42+
allowed, but never targeting another user, and never in a hateful manner.
43+
2. Remarks that moderators find inappropriate, whether listed in the code of
44+
conduct or not, are also not allowed.
45+
3. Moderators will first respond to such remarks with a warning.
46+
4. If the warning is unheeded, the user will be "kicked," i.e., kicked out of
47+
the communication channel to cool off.
48+
5. If the user comes back and continues to make trouble, they will be banned,
49+
i.e., indefinitely excluded.
50+
6. Moderators may choose at their discretion to un-ban the user if it was a
51+
first offense and they offer the offended party a genuine apology.
52+
7. If a moderator bans someone and you think it was unjustified, please take it
53+
up with that moderator, or with a different moderator, **in private**.
54+
Complaints about bans in-server are not allowed.
55+
8. Moderators are held to a higher standard than other community members. If a
56+
moderator creates an inappropriate situation, they should expect less leeway
57+
than others.
58+
59+
In the Enso community we all aim to go the extra mile and look out for each
60+
other. We don't just aim to be technically unimpeachable, but we try to be our
61+
very best selves. In particular, avoid flirting with offensive or sensitive
62+
topics, particularly if they're off-topic. Doing so all too often leads to
63+
unnecessary fights, hurt feelings and damaged trust; worse, it can drive people
64+
away from the community entirely.
65+
66+
If someone takes issue with something you said or did, resist the urge to be
67+
defensive. Just stop what it was they complained about and apologise. Even if
68+
you feel that you were misinterpreted or unfairly accused, it is likely that
69+
there was something you could've communicated better — remember it is _your_
70+
responsibility to make your fellow Enso contributors comfortable. Everyone wants
71+
to get along, and everyone in this community is here first and foremost to talk
72+
about cool technology! You will find that people will be eager to assume good
73+
intent and forgive as long as there is an atmosphere of trust.
74+
75+
The enforcement policies listed above apply to all official Enso venues. This
76+
includes the official discord and GitHub repositories under `luna`.
77+
78+
_Adapted from the_
79+
_[Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling)_
80+
_as well as the_
81+
_[Contributor Covenant v1.3.0](https://www.contributor-covenant.org/version/1/3/0/)._
82+
83+
[mod_team]: [[email protected]](mailto:[email protected])
84+
85+
## Credits
86+
This code of conduct is adapted from the [Rust](https://rust-lang.org) code of
87+
conduct. Many thanks to the Rust community for being such an exemplar of the
88+
open-source spirit!

0 commit comments

Comments
 (0)