[go: nahoru, domu]
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.

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

Jump to bottom

Post-merge fixes #3130

Merged
merged 5 commits into from
Nov 1, 2021
Merged

Post-merge fixes #3130

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7362f97
Prettier cleanup.
mwu-tow Nov 1, 2021
e102d0f
Merge code owners.
mwu-tow Nov 1, 2021
9732c05
ci workflows, fixing paths, removed old worflow file
mwu-tow Nov 1, 2021
ea27e2d
Prettier.
mwu-tow Nov 1, 2021
06dc9a9
Prettier.
mwu-tow Nov 1, 2021
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
Next Next commit
Prettier cleanup.
  • Loading branch information
@mwu-tow
mwu-tow committed Nov 1, 2021
commit 7362f9789921215afa41588976b4eeb42444da23
19 changes: 9 additions & 10 deletions .github/workflows/gui.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# DO NOT CHANGE THIS FILE. IT WAS GENERATED FROM 'build/workflow.js'. READ DOCS THERE TO LEARN MORE.
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

name: GUI CI
'on':
"on":
push:
branches:
- develop
Expand Down Expand Up @@ -51,7 +50,7 @@ jobs:
node ./run ci-gen --skip-version-validation
content=`cat CURRENT_RELEASE_CHANGELOG.json`
echo "::set-output name=content::$content"

shell: bash
- name: Assert Version Unstable
run: node ./run assert-version-unstable --skip-version-validation
Expand All @@ -77,7 +76,7 @@ jobs:
list=`git diff --name-only origin/${{github.base_ref}} HEAD | tr '\n' ' '`
echo $list
echo "::set-output name=list::'$list'"

shell: bash
if: >-
github.base_ref == 'develop' || github.base_ref == 'unstable' ||
Expand Down Expand Up @@ -274,7 +273,7 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: adopt
java-version: '11'
java-version: "11"
- name: Build WASM
run: node ./run build --no-js --skip-version-validation
- name: Upload IDE WASM artifacts
Expand Down Expand Up @@ -304,7 +303,7 @@ jobs:
node ./run ci-gen --skip-version-validation
content=`cat CURRENT_RELEASE_CHANGELOG.json`
echo "::set-output name=content::$content"

shell: bash
- name: Install Node
uses: actions/setup-node@v1
Expand Down Expand Up @@ -353,7 +352,7 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: adopt
java-version: '11'
java-version: "11"
- name: Download IDE WASM artifacts
uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -448,7 +447,7 @@ jobs:
node ./run ci-gen --skip-version-validation
content=`cat CURRENT_RELEASE_CHANGELOG.json`
echo "::set-output name=content::$content"

shell: bash
- id: checkCurrentReleaseTag
uses: mukunku/tag-exists-action@v1.0.0
Expand Down Expand Up @@ -505,7 +504,7 @@ jobs:
node ./run ci-gen --skip-version-validation
content=`cat CURRENT_RELEASE_CHANGELOG.json`
echo "::set-output name=content::$content"

shell: bash
- shell: bash
run: |2-
Expand All @@ -516,7 +515,7 @@ jobs:
us-west-1
text
EOF

- name: Upload 'index.js.gz' to CDN
shell: bash
run: >-
Expand Down
3 changes: 3 additions & 0 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ distribution/lib/Standard/Image/*/THIRD-PARTY
distribution/lib/Standard/Database/*/THIRD-PARTY
built-distribution/
THIRD-PARTY

# GUI has its own config in the subdirectory.
gui/
11 changes: 6 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,8 @@ Enso consists of several sub projects:
inspect Enso code as it runs. These components can be used on their own as
command line tools.

- **Enso IDE:** The [Enso IDE](https://github.com/enso-org/enso/tree/develop/gui) is the desktop
- **Enso IDE:** The
[Enso IDE](https://github.com/enso-org/enso/tree/develop/gui) is the desktop
application that allows working with the visual form of Enso. It consists of
an Electron application, a high performance WebGL UI framework, and the
searcher which provides contextual search, hints, and documentation for all of
Expand All @@ -220,10 +221,10 @@ Enso consists of several sub projects:

The Enso Engine is licensed under the
[Apache 2.0](https://opensource.org/licenses/apache-2.0), as specified in the
[LICENSE](https://github.com/enso-org/enso/blob/develop/LICENSE) file. The Enso IDE
is licensed under the [AGPL 3.0](https://opensource.org/licenses/AGPL-3.0), as
specified in the [LICENSE](https://github.com/enso-org/enso/blob/develop/gui/LICENSE)
file.
[LICENSE](https://github.com/enso-org/enso/blob/develop/LICENSE) file. The Enso
IDE is licensed under the [AGPL 3.0](https://opensource.org/licenses/AGPL-3.0),
as specified in the
[LICENSE](https://github.com/enso-org/enso/blob/develop/gui/LICENSE) file.

This license set was choosen to both provide you with a complete freedom to use
Enso, create libraries, and release them under any license of your choice, while
Expand Down
12 changes: 6 additions & 6 deletions docs/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,12 +602,12 @@ Hello, World!

#### Running IDE

You can start [IDE](https://github.com/enso-org/enso/tree/develop/gui) with a development version
of the language server. IDE executable has `--no-backend` flag that switches off
the bundled backend. That requires you to run the project manager process
yourself. You can either get a project manager from one of the latest releases
on [GitHub](https://github.com/enso-org/enso/releases), or build one using SBT
`buildProjectManagerDistribution` command.
You can start [IDE](https://github.com/enso-org/enso/tree/develop/gui) with a
development version of the language server. IDE executable has `--no-backend`
flag that switches off the bundled backend. That requires you to run the project
manager process yourself. You can either get a project manager from one of the
latest releases on [GitHub](https://github.com/enso-org/enso/releases), or build
one using SBT `buildProjectManagerDistribution` command.

##### Bash

Expand Down
26 changes: 13 additions & 13 deletions docs/syntax/types.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,19 @@ This means that you can section them, which is incredibly useful for programming
with types. In addition, Enso supports a number of additional operators for
working with types. These are listed below.

| Operator | Precedence Relations | Level | Assoc. | Description |
| :-------------------------------------------------------------------------------------------: | :--------------------------: | :---: | :----: | :-------------------------------------------------------------------------- |
| `:` | `> =` | 0 | Left | Ascribes the type (the right operand) to the value of the left operand. |
| `in` | `> :`, `> !` | 3 | Left | Ascribes the context (the right operand) to the value of the left operand. |
| `!` | `> :`, `> ->` | 2 | Left | Combines the left operand with the right operand as an error value. |
| `->` | `> :` | 1 | Left | Represents a mapping from the left operand to the right operand (function). |
| `<:` | `> !`, `< \|`, `> in` | 4 | Left | Asserts that the left operand is structurally subsumed by the right. |
| `~` | `== <:` | 4 | Left | Asserts that the left and right operands are structurally equal. |
| `;` | `< :`, `> =` | -2 | Left | Concatenates the left and right operand typesets to create a new typeset. |
| `\|` | `> <:`, `> !`, `> in`, `> :` | 5 | Left | Computes the union of the left and right operand typesets. |
| `&` | `> \|` | 6 | Left | Computes the intersection of the left and right operand typesets. |
| `\` | `> &` | 7 | Left | Computes the subtraction of the right typeset from the left typeset. |
| `:=` | `< :`, `> =`, `> ;` | -1 | Left | Creates a typeset member by assigning a value to a label. |
| Operator | Precedence Relations | Level | Assoc. | Description |
| :------: | :--------------------------: | :---: | :----: | :-------------------------------------------------------------------------- |
| `:` | `> =` | 0 | Left | Ascribes the type (the right operand) to the value of the left operand. |
| `in` | `> :`, `> !` | 3 | Left | Ascribes the context (the right operand) to the value of the left operand. |
| `!` | `> :`, `> ->` | 2 | Left | Combines the left operand with the right operand as an error value. |
| `->` | `> :` | 1 | Left | Represents a mapping from the left operand to the right operand (function). |
| `<:` | `> !`, `< \|`, `> in` | 4 | Left | Asserts that the left operand is structurally subsumed by the right. |
| `~` | `== <:` | 4 | Left | Asserts that the left and right operands are structurally equal. |
| `;` | `< :`, `> =` | -2 | Left | Concatenates the left and right operand typesets to create a new typeset. |
| `\|` | `> <:`, `> !`, `> in`, `> :` | 5 | Left | Computes the union of the left and right operand typesets. |
| `&` | `> \|` | 6 | Left | Computes the intersection of the left and right operand typesets. |
| `\` | `> &` | 7 | Left | Computes the subtraction of the right typeset from the left typeset. |
| `:=` | `< :`, `> =`, `> ;` | -1 | Left | Creates a typeset member by assigning a value to a label. |

Solving this set of inequalities produces the _relative_ precedence levels for
these operators shown in the table above. In order to check this, you can use
Expand Down