Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into oersi
Browse files Browse the repository at this point in the history
  • Loading branch information
fsteeg committed Mar 17, 2021
2 parents f81a1a2 + 13dad37 commit 9ae4555
Show file tree
Hide file tree
Showing 7 changed files with 85 additions and 18 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Build

on: push

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build
- name: Install language server
run: ./gradlew installServer
- name: Change directory
run: cd org.metafacture.fix.vsc/
- name: Install fix extension
run: npm install
42 changes: 42 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@

name: Build and Deploy

on:
push:
branches:
- master

jobs:
build-and-deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Node.js
uses: actions/setup-node@v1
- name: Set up vsce
run: npm install -g vsce
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Build with Gradle
run: |
chmod +x gradlew
./gradlew build
./gradlew installServer
- name: Create fix extension
working-directory: org.metafacture.fix.vsc/
run: |
npm install
vsce package -o fix.vsix
- name: Pushes vsix to GitHub Pages
uses: dmnemec/copy_file_to_another_repo_action@v1.0.4
env:
API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
with:
source_file: 'org.metafacture.fix.vsc/fix.vsix'
destination_repo: 'metafacture/metafacture.github.io'
destination_branch: main
destination_folder: 'extensions'
user_email: '${{ github.actor }}@users.noreply.github.com'
user_name: '${{ github.actor }}'
8 changes: 0 additions & 8 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ See [https://github.com/elag/FIG](https://github.com/elag/FIG)

# State

[![Build Status](https://travis-ci.org/metafacture/metafacture-fix.svg?branch=master)](https://travis-ci.org/metafacture/metafacture-fix)
[![Build and Deploy](https://github.com/metafacture/metafacture-fix/workflows/Build%20and%20Deploy/badge.svg)](https://github.com/metafacture/metafacture-fix/actions?query=workflow%3A%22Build+and+Deploy%22)

This repo contains an Xtext web project with a basic Fix grammar, which generates a parser, a web editor, and a language server. The repo also contains an extension for VS code/codium based on that language server. The web editor UI contains input fields for sample data and a [Flux](https://github.com/metafacture/metafacture-core/wiki#flux) definition to run workflows with the given Fix. A test deployment of the web server is available at: [http://test.lobid.org/fix](http://test.lobid.org/fix).

Expand Down
8 changes: 1 addition & 7 deletions org.metafacture.fix.vsc/fix.configuration.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,19 @@
{
"comments": {
// symbol used for single line comment. Remove this entry if your language does not support line comments
"lineComment": "//",
// symbols used for start and end a block comment. Remove this entry if your language does not support block comments
"blockComment": [ "/*", "*/" ]
"blockComment": [ "\\*", "*/" ]
},
// symbols used as brackets
"brackets": [
["{", "}"],
["[", "]"],
["(", ")"]
],
// symbols that are auto closed when typing
"autoClosingPairs": [
["{", "}"],
["[", "]"],
["(", ")"],
["\"", "\""],
["'", "'"]
],
// symbols that that can be used to surround a selection
"surroundingPairs": [
["{", "}"],
["[", "]"],
Expand Down
7 changes: 7 additions & 0 deletions org.metafacture.fix.vsc/fix.snippets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"do bind": {
"prefix": ["do"],
"body": ["do ${1:collector}(${2:args})", "\t${0:body}", "end"],
"description": "A do bind changes the execution context of the body functions. They are executed for each element in the list."
}
}
13 changes: 11 additions & 2 deletions org.metafacture.fix.vsc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@
"name": "fix",
"displayName": "fix",
"description": "Language Support for Metafacture Fix (Xtext Language Server for Metafacture Fix). For more information, visit https://metafacture.org",
"version": "0.0.1",
"version": "0.1.1",
"publisher": "metafacture",
"license": "Apache-2.0",
"engines": {
"vscode": "^1.18.0"
},
"categories": [
"Programming Languages"
"Programming Languages",
"Snippets"
],
"activationEvents": [
"onLanguage:fix"
Expand All @@ -33,7 +35,14 @@
"scopeName": "text.fix",
"path": "./fix.tmLanguage"
}
],
"snippets": [
{
"language": "fix",
"path": "./fix.snippets.json"
}
]

},
"scripts": {
"vscode:prepublish": "tsc -p ./",
Expand Down

0 comments on commit 9ae4555

Please sign in to comment.