From 5749eb6db883cb06062a0a3e7126e32f8d5c8203 Mon Sep 17 00:00:00 2001 From: Sam Estep Date: Fri, 17 May 2024 15:54:38 -0400 Subject: [PATCH 1/4] Combine English and French VS Code extensions --- .github/workflows/release.yml | 18 +++++ syntax_highlighting/en/setup_vscode.sh | 12 ---- .../en/vscode/.vscode/launch.json | 18 ----- syntax_highlighting/en/vscode/README.md | 65 ----------------- syntax_highlighting/en/vscode/package.json | 25 ------- syntax_highlighting/fr/setup_vscode.sh | 12 ---- .../fr/vscode/.vscode/launch.json | 18 ----- syntax_highlighting/fr/vscode/.vscodeignore | 4 -- syntax_highlighting/fr/vscode/CHANGELOG.md | 9 --- .../fr/vscode/language-configuration.json | 67 ------------------ syntax_highlighting/fr/vscode/package.json | 25 ------- .../fr/vscode/vsc-extension-quickstart.md | 29 -------- .../{en => }/vscode/.vscodeignore | 0 .../{en => }/vscode/CHANGELOG.md | 2 +- syntax_highlighting/{fr => }/vscode/README.md | 4 +- .../vscode/language-configuration.json | 0 syntax_highlighting/vscode/logo.png | Bin 0 -> 6625 bytes syntax_highlighting/vscode/package.json | 42 +++++++++++ .../catalavs.xml => vscode/syntaxes/en.xml} | 0 .../catalavs.xml => vscode/syntaxes/fr.xml} | 0 .../vscode/vsc-extension-quickstart.md | 0 21 files changed, 63 insertions(+), 287 deletions(-) create mode 100644 .github/workflows/release.yml delete mode 100755 syntax_highlighting/en/setup_vscode.sh delete mode 100644 syntax_highlighting/en/vscode/.vscode/launch.json delete mode 100644 syntax_highlighting/en/vscode/README.md delete mode 100644 syntax_highlighting/en/vscode/package.json delete mode 100755 syntax_highlighting/fr/setup_vscode.sh delete mode 100644 syntax_highlighting/fr/vscode/.vscode/launch.json delete mode 100644 syntax_highlighting/fr/vscode/.vscodeignore delete mode 100644 syntax_highlighting/fr/vscode/CHANGELOG.md delete mode 100644 syntax_highlighting/fr/vscode/language-configuration.json delete mode 100644 syntax_highlighting/fr/vscode/package.json delete mode 100644 syntax_highlighting/fr/vscode/vsc-extension-quickstart.md rename syntax_highlighting/{en => }/vscode/.vscodeignore (100%) rename syntax_highlighting/{en => }/vscode/CHANGELOG.md (65%) rename syntax_highlighting/{fr => }/vscode/README.md (92%) rename syntax_highlighting/{en => }/vscode/language-configuration.json (100%) create mode 100644 syntax_highlighting/vscode/logo.png create mode 100644 syntax_highlighting/vscode/package.json rename syntax_highlighting/{en/vscode/syntaxes/catalavs.xml => vscode/syntaxes/en.xml} (100%) rename syntax_highlighting/{fr/vscode/syntaxes/catalavs.xml => vscode/syntaxes/fr.xml} (100%) rename syntax_highlighting/{en => }/vscode/vsc-extension-quickstart.md (100%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..c0491102 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,18 @@ +name: Release +on: + release: + types: + - created + +jobs: + vscode: + name: Publish VS Code extension + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Publish VS Code extension + working-directory: syntax_highlighting/vscode + run: npx vsce publish + env: + VSCE_PAT: ${{ secrets.VSCE_PAT }} diff --git a/syntax_highlighting/en/setup_vscode.sh b/syntax_highlighting/en/setup_vscode.sh deleted file mode 100755 index 16f87d59..00000000 --- a/syntax_highlighting/en/setup_vscode.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env sh - -set -eu - -FILE=~/.vscode/extensions/catala-en -SCRIPT=`realpath $0` -SCRIPTPATH=`dirname $SCRIPT` - -if [ ! -L "$FILE" ]; then - echo "Creating link" - ln -s -f $SCRIPTPATH/vscode "$FILE" -fi diff --git a/syntax_highlighting/en/vscode/.vscode/launch.json b/syntax_highlighting/en/vscode/.vscode/launch.json deleted file mode 100644 index 7bc18a44..00000000 --- a/syntax_highlighting/en/vscode/.vscode/launch.json +++ /dev/null @@ -1,18 +0,0 @@ -// A launch configuration that launches the extension inside a new window -// Use IntelliSense to learn about possible attributes. -// Hover to view descriptions of existing attributes. -// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 -{ - "version": "0.2.0", - "configurations": [ - { - "name": "Extension", - "type": "extensionHost", - "request": "launch", - "runtimeExecutable": "${execPath}", - "args": [ - "--extensionDevelopmentPath=${workspaceFolder}" - ] - } - ] -} \ No newline at end of file diff --git a/syntax_highlighting/en/vscode/README.md b/syntax_highlighting/en/vscode/README.md deleted file mode 100644 index e54bc79b..00000000 --- a/syntax_highlighting/en/vscode/README.md +++ /dev/null @@ -1,65 +0,0 @@ -# catala-en README - -This is the README for your extension "catala-en". After writing up a brief description, we recommend including the following sections. - -## Features - -Describe specific features of your extension including screenshots of your extension in action. Image paths are relative to this README file. - -For example if there is an image subfolder under your extension project workspace: - -\!\[feature X\]\(images/feature-x.png\) - -> Tip: Many popular extensions utilize animations. This is an excellent way to show off your extension! We recommend short, focused animations that are easy to follow. - -## Requirements - -If you have any requirements or dependencies, add a section describing those and how to install and configure them. - -## Extension Settings - -Include if your extension adds any VS Code settings through the `contributes.configuration` extension point. - -For example: - -This extension contributes the following settings: - -* `myExtension.enable`: enable/disable this extension -* `myExtension.thing`: set to `blah` to do something - -## Known Issues - -Calling out known issues can help limit users opening duplicate issues against your extension. - -## Release Notes - -Users appreciate release notes as you update your extension. - -### 1.0.0 - -Initial release of ... - -### 1.0.1 - -Fixed issue #. - -### 1.1.0 - -Added features X, Y, and Z. - ------------------------------------------------------------------------------------------------------------ - -## Working with Markdown - -**Note:** You can author your README using Visual Studio Code. Here are some useful editor keyboard shortcuts: - -* Split the editor (`Cmd+\` on macOS or `Ctrl+\` on Windows and Linux) -* Toggle preview (`Shift+CMD+V` on macOS or `Shift+Ctrl+V` on Windows and Linux) -* Press `Ctrl+Space` (Windows, Linux) or `Cmd+Space` (macOS) to see a list of Markdown snippets - -### For more information - -* [Visual Studio Code's Markdown Support](http://code.visualstudio.com/docs/languages/markdown) -* [Markdown Syntax Reference](https://help.github.com/articles/markdown-basics/) - -**Enjoy!** diff --git a/syntax_highlighting/en/vscode/package.json b/syntax_highlighting/en/vscode/package.json deleted file mode 100644 index dd540245..00000000 --- a/syntax_highlighting/en/vscode/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "catala-en", - "displayName": "catala-en", - "description": "Syntax highlighting for English Catala programs", - "version": "0.0.1", - "engines": { - "vscode": "^1.48.0" - }, - "categories": [ - "Programming Languages" - ], - "contributes": { - "languages": [{ - "id": "catala_en", - "aliases": ["catala_en", "catala_en"], - "extensions": [".catala_en"], - "configuration": "./language-configuration.json" - }], - "grammars": [{ - "language": "catala_en", - "scopeName": "source.catala_en", - "path": "./syntaxes/catalavs.xml" - }] - } -} \ No newline at end of file diff --git a/syntax_highlighting/fr/setup_vscode.sh b/syntax_highlighting/fr/setup_vscode.sh deleted file mode 100755 index 8187cabf..00000000 --- a/syntax_highlighting/fr/setup_vscode.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env sh - -set -eu - -FILE=~/.vscode/extensions/catala-fr -SCRIPT=`realpath $0` -SCRIPTPATH=`dirname $SCRIPT` - -if [ ! -L "$FILE" ]; then - echo "Creating link" - ln -s -f $SCRIPTPATH/vscode "$FILE" -fi diff --git a/syntax_highlighting/fr/vscode/.vscode/launch.json b/syntax_highlighting/fr/vscode/.vscode/launch.json deleted file mode 100644 index 7bc18a44..00000000 --- a/syntax_highlighting/fr/vscode/.vscode/launch.json +++ /dev/null @@ -1,18 +0,0 @@ -// A launch configuration that launches the extension inside a new window -// Use IntelliSense to learn about possible attributes. -// Hover to view descriptions of existing attributes. -// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 -{ - "version": "0.2.0", - "configurations": [ - { - "name": "Extension", - "type": "extensionHost", - "request": "launch", - "runtimeExecutable": "${execPath}", - "args": [ - "--extensionDevelopmentPath=${workspaceFolder}" - ] - } - ] -} \ No newline at end of file diff --git a/syntax_highlighting/fr/vscode/.vscodeignore b/syntax_highlighting/fr/vscode/.vscodeignore deleted file mode 100644 index f369b5e5..00000000 --- a/syntax_highlighting/fr/vscode/.vscodeignore +++ /dev/null @@ -1,4 +0,0 @@ -.vscode/** -.vscode-test/** -.gitignore -vsc-extension-quickstart.md diff --git a/syntax_highlighting/fr/vscode/CHANGELOG.md b/syntax_highlighting/fr/vscode/CHANGELOG.md deleted file mode 100644 index 295eb6e1..00000000 --- a/syntax_highlighting/fr/vscode/CHANGELOG.md +++ /dev/null @@ -1,9 +0,0 @@ -# Change Log - -All notable changes to the "catala-fr" extension will be documented in this file. - -Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file. - -## [Unreleased] - -- Initial release \ No newline at end of file diff --git a/syntax_highlighting/fr/vscode/language-configuration.json b/syntax_highlighting/fr/vscode/language-configuration.json deleted file mode 100644 index be68f247..00000000 --- a/syntax_highlighting/fr/vscode/language-configuration.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "comments": { - // symbol used for single line comment. Remove this entry if your language does not support line comments - "lineComment": "#", - }, - // symbols used as brackets - "brackets": [ - [ - "{", - "}" - ], - [ - "[", - "]" - ], - [ - "(", - ")" - ] - ], - // symbols that are auto closed when typing - "autoClosingPairs": [ - [ - "{", - "}" - ], - [ - "[", - "]" - ], - [ - "(", - ")" - ], - [ - "\"", - "\"" - ], - [ - "'", - "'" - ] - ], - // symbols that can be used to surround a selection - "surroundingPairs": [ - [ - "{", - "}" - ], - [ - "[", - "]" - ], - [ - "(", - ")" - ], - [ - "\"", - "\"" - ], - [ - "'", - "'" - ] - ] -} \ No newline at end of file diff --git a/syntax_highlighting/fr/vscode/package.json b/syntax_highlighting/fr/vscode/package.json deleted file mode 100644 index 86a0e6c1..00000000 --- a/syntax_highlighting/fr/vscode/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "catala-fr", - "displayName": "catala-fr", - "description": "Syntax highlighting for French Catala programs", - "version": "0.0.1", - "engines": { - "vscode": "^1.48.0" - }, - "categories": [ - "Programming Languages" - ], - "contributes": { - "languages": [{ - "id": "catala_fr", - "aliases": ["catala_fr", "catala_fr"], - "extensions": [".catala_fr"], - "configuration": "./language-configuration.json" - }], - "grammars": [{ - "language": "catala_fr", - "scopeName": "source.catala_fr", - "path": "./syntaxes/catalavs.xml" - }] - } -} \ No newline at end of file diff --git a/syntax_highlighting/fr/vscode/vsc-extension-quickstart.md b/syntax_highlighting/fr/vscode/vsc-extension-quickstart.md deleted file mode 100644 index 5f2b99e5..00000000 --- a/syntax_highlighting/fr/vscode/vsc-extension-quickstart.md +++ /dev/null @@ -1,29 +0,0 @@ -# Welcome to your VS Code Extension - -## What's in the folder - -* This folder contains all of the files necessary for your extension. -* `package.json` - this is the manifest file in which you declare your language support and define the location of the grammar file that has been copied into your extension. -* `syntaxes/catalavs.xml` - this is the Text mate grammar file that is used for tokenization. -* `language-configuration.json` - this is the language configuration, defining the tokens that are used for comments and brackets. - -## Get up and running straight away - -* Make sure the language configuration settings in `language-configuration.json` are accurate. -* Press `F5` to open a new window with your extension loaded. -* Create a new file with a file name suffix matching your language. -* Verify that syntax highlighting works and that the language configuration settings are working. - -## Make changes - -* You can relaunch the extension from the debug toolbar after making changes to the files listed above. -* You can also reload (`Ctrl+R` or `Cmd+R` on Mac) the VS Code window with your extension to load your changes. - -## Add more language features - -* To add features such as intellisense, hovers and validators check out the VS Code extenders documentation at https://code.visualstudio.com/docs - -## Install your extension - -* To start using your extension with Visual Studio Code copy it into the `/.vscode/extensions` folder and restart Code. -* To share your extension with the world, read on https://code.visualstudio.com/docs about publishing an extension. diff --git a/syntax_highlighting/en/vscode/.vscodeignore b/syntax_highlighting/vscode/.vscodeignore similarity index 100% rename from syntax_highlighting/en/vscode/.vscodeignore rename to syntax_highlighting/vscode/.vscodeignore diff --git a/syntax_highlighting/en/vscode/CHANGELOG.md b/syntax_highlighting/vscode/CHANGELOG.md similarity index 65% rename from syntax_highlighting/en/vscode/CHANGELOG.md rename to syntax_highlighting/vscode/CHANGELOG.md index 399e9815..4bd7b78e 100644 --- a/syntax_highlighting/en/vscode/CHANGELOG.md +++ b/syntax_highlighting/vscode/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log -All notable changes to the "catala-en" extension will be documented in this file. +All notable changes to the "catala" extension will be documented in this file. Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file. diff --git a/syntax_highlighting/fr/vscode/README.md b/syntax_highlighting/vscode/README.md similarity index 92% rename from syntax_highlighting/fr/vscode/README.md rename to syntax_highlighting/vscode/README.md index 5148918e..7ff2fcf9 100644 --- a/syntax_highlighting/fr/vscode/README.md +++ b/syntax_highlighting/vscode/README.md @@ -1,6 +1,6 @@ -# catala-fr README +# catala README -This is the README for your extension "catala-fr". After writing up a brief description, we recommend including the following sections. +This is the README for your extension "catala". After writing up a brief description, we recommend including the following sections. ## Features diff --git a/syntax_highlighting/en/vscode/language-configuration.json b/syntax_highlighting/vscode/language-configuration.json similarity index 100% rename from syntax_highlighting/en/vscode/language-configuration.json rename to syntax_highlighting/vscode/language-configuration.json diff --git a/syntax_highlighting/vscode/logo.png b/syntax_highlighting/vscode/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..4d85ce14b056f34b3f2f7d455bba2f21e811de32 GIT binary patch literal 6625 zcmb_h2T)Vno5v>tq6i`=9i%*zsuYnfO$$T0~#4+)Hdf+Lx|z7Q58 zBMActBourn90CpsRJ05VGztm`@Cx+=d-yBb`ZC!t@CW;ON%%q_!CK17o}peI5O9Q- zCzB{BFzk>kWq+`zS74Y|nDU)S#XwKRFb`!lrAx|2cu61&i$D{=*ud`oi|B@@|xw5@0X6+CLyo(rhAql2$!KzG``OO;hkG zNmcew)sUR0pVCP;&kAe9UrU_)^6`tW*Xhz@PgoILtrf()Y3lIf>!p>eh*ztxqF$kU zN}!{da4N{Y5;RNh#KOdmGr#+<>s>ui+yD1RANb(#K9aJe1TdFAW(GPNCzqEE8EZya zIDB=*GB!b3zgL!pjc40uXxi{i3+Gqz_flEzCD&ER(~M)oAYq~|=dFw)&oxEB)y(K&WC`Qzu(`&U zsqMA^m~$de+;`62LdCoRA>*8IpNn-ztm~S6%(o>%$L&X5SjPU$@*m(e=ANFBIcm)d zU#ehN9um!}5@gBcHeh{yHJ&3bg!MEFi9?d5@7Uw;(kaAw#L_F}iEk`+9dupNlITtT zc_)(-Wp!OkTU%H~g}(+GV6=`X_T;osg#vGubg2{;0aKnMmog>(xGnNu*F0_fe<0{6 zLwvuLVFNbJq7Db~$NS|?)P*@*rL;9AmRE!1M((jC`69W0zN;(LZKp=TjH}s4z3P46 zKH|?P80Q^CBZ970fice#E|U>z>Y~PL z6?MsCn$IVDK$zGbA0DoZ$_+is%Zi1}_~ZUg0OOl0dwn$sSq8+!eee2P;&a{VRwXKl z@2O~GOuPQ?sbgk7Gb;8QJvG?q)~H*UY?@p?39}38#W-a?q`f*n*cxX?GPvsuFIcM9 zd-Sf&K9|H-2$IO>ZG5~@e9qPASdU|CB2@f8l=wdie0;OTn<>bK{a#NmU2^QMQ?i3X zJr=!!ASNDsH>KvbiUH7}26nwLtUq>zu`y>^OTO8h&TsMi-5wci>FPESpe!bchZgI( zE~Hhg@>@iGT@WlL^ls0Rgv69%cn^YNdRin)xD@gVPL)CW#)~zEy2{=k^;Feu&*)S2 zYB0@FV6fxEf87V}Wo6`5=bw0=lSytn$VO$;?gd6~n;aR5-a&+HaaD8bAyb`sI3*gPo(aQu|D8whH;R2Fr#9bO(zB>M+( z3Pm=cy-j1<8{B~UwFFw{!dUU@J*|{757$G@;=Q_k)|P`!#>0rzfMOqX;t;SMWiY82 zaLKLDtLLCIsmi>@Ol|ld7&*{F-){kpyzWWFXFDWVf3%VQL624u!hS@o#@;a~SUOrv z;Js)%VCQ8yFfGvPHDAyI6{=g55X#U*Z)9;7D0!OcH6blPJDV}s74H3=Z-C*KK*WPJ zvg6S9$NAX(DNQ=vY9zP4R7ZEGT0X`If-VQM{byJHmlZhT+o@9F@Pn^0e~nV)0a(HcT?ioIivy7w^}b{E@MZ4AVqr^49=ll>v9KY~#?^DX!Gn6+Oq)9c{-aym z9bdoTyRBJfwJp<18*a*ZLEH8#v=>LtcGhCXAUq$QBE_P9+?@!BU7tEuY%r#gvmG;Q zr@KihDmH*bN!T}U=IP-0tEKBJ3l+mVUII8g) zJAYO?`uA~dNX3(uu)XUF8sdv8B}|}xQc7H%(hCOrLMreH1NDSyq4=~%Eo6umY3Y+S zc;abL5T_jP-~*!FG;Zn}1TdmqezB&pKl02)QH>?z}2FLqID?&0k(fi4o~1$P80`|FVt$-7#rQ|(g}Le}!Qlm8vf#W%PP zV0#QXOLjC(#;irUHSb~e`hl!yR(0+TxVN+SeFB7Hzf086Ls(zBjm|AAh%i8rUjt@0 zx)>Gdq#s1V8WsJh?I%4OU-ak;Rg{}~HgOO zTuxJfIqktOPP`Z2EXuC{c0g?1#kC}(R(9T1nHz}t6Ku>qE9%MqDT#LH@JU4cRoAHXMGeM4KzoR1gt+ec$^{uSu=B~Dp zjHeT(hMbcYT@AEA#Md}L=G%HJFK?Ka0<<);n!v9D+fzy`hkC?&|rBnMYDYbdY z(t!4c0NgohQMs>ZZ@>i+gG4~&FGk7du)XBDy$$XX>g3c*l-TZ;WrF=nm$i+g_#&|z z?tF%1-S$|gYW5s9Im1?|6zfK!0hQmK-gd;DLy~VKh`t(%T*&|@{9SsxT-tPV*Hm?P z9V9;9)B@_BeTi5J_KrKS1I;Vxq((4=Vxg!8ENLK-J+9e0^4ef#WYfuc4$M;Y%+ zu!E#4^ej<<&<4FRpq9s&Z}j4Y>2Y}5)+zDd%y7XSPzV9Qq|A9C2!4e*zTPIV&jV$QUWu&fN!O~SS>-uTI_I5W} zZ=DX9!o}_!MV{M_+}ORMiL6t9OlfUaU5c$Qg1DR`w4GyDUsbIo$WF9kXpyr~7A-+% zqA18CnolXz>t|VSWml*mi|=1Hm)+`uap4*fT@69@pWDW!dF&?ZQ_k)H`Bxrz8q4ne zL@8Av^oCUk&8SFNmw&WmssaG&Ho4Tvs6D7~ziL<=-o#^U(o7%s;M&zu3hr-JD$tjYWHn1!Z?n1bhl23uTgnF23RTTDBOiuxqbzf2`=W9D`59^E;gQpGF+q?UwxBrYiJ=*`g|IwZwRC=J~O25fik zLxFwuH$UL;AuH6iQ)yiCg=#H3bjv04&gRY9!ft(WaH!Qf=?*K7F8~8M+h^W`Et&a@ z92#Bx<6&H-HdFJq7}`9;K@9Z*1(d4QK=|4A`S5iG0L&MRA@ecRx`~n%;n7AbJa^}5 zW82T#`J=0o8133g1+cZFsS|uo_cq{V9E99T%wu2@F0Mo-T$WEVt8&v_#6O?G@!HVR zt{?m3pv0;#1ZL_&*5VG8N~!vabEEe-$`y8D8Pf|r1v_IF2SpRo&;b79uUNo6+T88F@v96(_BUq-X;i%wg8z&iM7!1_VPH>E*n%#6c-gqF$EAu88+^ zD06D=Y|Va|crPWIcdGUm@9`;gcq>h<$&|Q8eH^bJ@0$}LBC>@k45zWXC=2F&_qp@Q z49Tuo@^xK5sDDJJm8wYf-q_{0IIO~=hcz9kdXEiA7gi(Ym_na|qas2u3)o-oFMm9TB`N2}9cMDXnNiXD z&IjJZbklK7`Q^PAHdhP?qoR666P?$CJq_hZOQ{&5V^)ic;gUNpw}oi}f{ti18&y2t zX%uIx95SvY$XrDSJrvu7v4XT)EeSTIUY6I?LOjQ7RRghcv(cV~G0J&5tp4&oy}aCS zEl(NPNlb>rO45STSs{c1_#eB;L?72PXR3BGP!G1Bou8}T&-O!egGuPN7e;d3D2-#` z@A!!=8e&@C7`gh*QYoA$^6=%k$oN%skIBnFly{VKBY**$&&8ylg|x1iAk(^EELklj zy(11U2silKnfldy_1=gS>>tNyL}6{EL+sTAS#LcIwV*YDVO=vZY}NNUrs0QcZFw*a zEj@MqL3eu)P@|JM=?GyI;iys9`ettZ_ZKe2)4&|J_u=C(`=?YT*9g3h zJS%g1@x7Q%W_{HT(&%Jr)frwXPc{ut!Y076%fjn!`iQeTTo+IZVB2=aSi??pfH?)} zpF3wtpC%kos=wV~y;bb4qf*7>6T5N_3(yVEB8tOSo#d=%R%f4QwzZsh zPF0SaCv~`7!N$tKYwIt#`f-%$%nJcv)QpwEy~rcnNQzuh#C%6i0A+Sy26MUUC#-X# zg7JlGNB3*NV|mBL^tvkFYeQty7#eIn$v_4_WA`zcp&^=6@y)3Z>Y)eNeWScLrZH2` zf1>6X>mP%{6o@Z#HJwB z?u3XeEzI2tqjte{bbaUauwR4idmmi9d8G>S`W-=Ll^Y&$p;E)@Ln}Gs7AD^_cQ06> z{4ib=P43ODvK!>)^%5ou!;b$9P(JCdmK}BJcJ1Xmy-?u?(hovnEt__sZL2~xI}*EV z#3MyRmsQ`47?n>){-jsA!mgH1Jc<*NY>Pj#*Zhr#w3a@asip=m9^LSCg>vy2M@pou z|N0`m8dsr;Wb0QE5|Ix`UJq;FqR7*RiQjPpRDIc@IN|6d7v6$k}0o%dbYT?FLr~kwYY-s|1jj4 zztn{ofu>pG^`a>^@iGD$U6rAX@;Ta@h&g-UrH9Z9+@KCW_#&^;nMOtWLQzXNmJ5=2 zK*K8JFMUkS>7YHjLZ2uSts1J~e70w6W1tr{q@W2$^hTCB4&-(w3sU0Y6H4IEXnEnS zZ{x!S_yt|p+lq_s#8Uk|VD-Urw5*zt25pDc-@HzX(z-gxHXCZu0{^ro?vqG6Z5(+B zUi{TI?%r(Z)ja&%EWIxv91|F+PkA z-!dz@n)mrcazEsEQQ|3)$BPJj$OrRH5>DW_?}xWF4&m3CM~YXi=0Y*myGa`HHHT)_ zx*zZJdQ{Lcs08ry_f&-?cNGM!UyDC_k!cEi=4i7Dk&O4MX|isWqnVQDU0*(_d=z}G zO-6l^-A=r194BOB>USfIurxM)tJ*}=qxH)A8sEJ)pBm48I@wF}=?@S84z$tr;nmXp zwMtgaAASB3^?e}qO@(KODbrq!2XDE3w&@sgP`hiDe(W(DAEIRp=ThygXfPabqP9h< z9+}ywJnzg$Til zi{SKi!Yuno`kqn!{}e0{jb%`y`8a;)n>&AQL&dlo_l7$rJA_Y==~_3HS#NO>4wf2w zcDeh1@P%kqt^pJ#TZWmE`k?t=JMhAM{B9 zL!R*q{n=3?(l_%$vdgLOE%I25ILd^)2&2nwg9RSJ#FGnOk@lOX?X%C2b9VDeO7Jg9 zO=W7eBGsYro<`}dQx%)Su_1Q{`#ISZ5zfE{P-kS7x7r$i16z!l{rCBD&s};i<(2|C z@L8HosEnw-V|Ueezo0D2nr_1G_PKMa7XJLDV25MOvr7YGC>1PhSgCTUV1n`c;3D2j zf}8ag|9ymP6?9h~3Zt2|QGe!-a8+C6Jrv<6le?rd5?fI#AVi|qL6~$-gEl5l&mNyD z(0|$$@+?#0)gK$v6lOL$i}$jtw2G~9JMGYqxF2I^|DBs!Qq7Ik4F8}Ktq1p-AuOZdp3}dtO-quA6+uxa=G@j{vMC9z4ugi4Se`< zfzr_na{mb1`Cmi6hluW)3%29nXIKB@@T)BRfw9>8xJ-ML1oQk>3k|MuNrGX&y{17q!NqCR(SHnf0FJ1<>~G+?=xW!iRMZFol3-1$VD%QIcqX0~k7 zPY*z9&cxBu32EXme2BG~K0i>LKtF+YIOPmqRSIxpxtBy)qD9d6*{$vp;OZ&Ti-%}C zb9~!%G@!Ygc9aE#%t3B~A_8N7C}Selxbn~FvPVFbFbgG$o$!hX0OC7bKW;`PC({Xj qFwlIow~aJK4N`UE`PUDEo&(WheogPV#7o}}y8tGZ#z@24@&5*tnYzgU literal 0 HcmV?d00001 diff --git a/syntax_highlighting/vscode/package.json b/syntax_highlighting/vscode/package.json new file mode 100644 index 00000000..a81ae995 --- /dev/null +++ b/syntax_highlighting/vscode/package.json @@ -0,0 +1,42 @@ +{ + "name": "catala", + "displayName": "Catala", + "description": "Syntax highlighting for Catala programs", + "version": "0.10.0", + "license": "Apache-2.0", + "private": true, + "engines": { + "vscode": "^1.48.0" + }, + "categories": [ + "Programming Languages" + ], + "icon": "logo.png", + "repository": { + "type": "git", + "url": "https://github.com/CatalaLang/catala", + "directory": "syntax_highlighting/vscode" + }, + "contributes": { + "languages": [{ + "id": "catala_en", + "aliases": ["Catala (English)"], + "extensions": [".catala_en"], + "configuration": "./language-configuration.json" + }, { + "id": "catala_fr", + "aliases": ["Catala (French)"], + "extensions": [".catala_fr"], + "configuration": "./language-configuration.json" + }], + "grammars": [{ + "language": "catala_en", + "scopeName": "source.catala_en", + "path": "./syntaxes/en.xml" + }, { + "language": "catala_fr", + "scopeName": "source.catala_fr", + "path": "./syntaxes/fr.xml" + }] + } +} diff --git a/syntax_highlighting/en/vscode/syntaxes/catalavs.xml b/syntax_highlighting/vscode/syntaxes/en.xml similarity index 100% rename from syntax_highlighting/en/vscode/syntaxes/catalavs.xml rename to syntax_highlighting/vscode/syntaxes/en.xml diff --git a/syntax_highlighting/fr/vscode/syntaxes/catalavs.xml b/syntax_highlighting/vscode/syntaxes/fr.xml similarity index 100% rename from syntax_highlighting/fr/vscode/syntaxes/catalavs.xml rename to syntax_highlighting/vscode/syntaxes/fr.xml diff --git a/syntax_highlighting/en/vscode/vsc-extension-quickstart.md b/syntax_highlighting/vscode/vsc-extension-quickstart.md similarity index 100% rename from syntax_highlighting/en/vscode/vsc-extension-quickstart.md rename to syntax_highlighting/vscode/vsc-extension-quickstart.md From bca0fb84a83c07942b435683103cbe5f5903f781 Mon Sep 17 00:00:00 2001 From: Louis Gesbert Date: Tue, 21 May 2024 11:20:24 +0200 Subject: [PATCH 2/4] Update the Catala vscode extension README --- syntax_highlighting/vscode/README.md | 63 ++-------------------------- 1 file changed, 4 insertions(+), 59 deletions(-) diff --git a/syntax_highlighting/vscode/README.md b/syntax_highlighting/vscode/README.md index 7ff2fcf9..bec7ddf9 100644 --- a/syntax_highlighting/vscode/README.md +++ b/syntax_highlighting/vscode/README.md @@ -1,65 +1,10 @@ # catala README -This is the README for your extension "catala". After writing up a brief description, we recommend including the following sections. +VScode extension for the Catala language: https://catala-lang.org -## Features - -Describe specific features of your extension including screenshots of your extension in action. Image paths are relative to this README file. - -For example if there is an image subfolder under your extension project workspace: - -\!\[feature X\]\(images/feature-x.png\) - -> Tip: Many popular extensions utilize animations. This is an excellent way to show off your extension! We recommend short, focused animations that are easy to follow. +Files with english syntax (extension `.catala_en`) and french syntax (extension +`.catala_fr`) are supported. ## Requirements -If you have any requirements or dependencies, add a section describing those and how to install and configure them. - -## Extension Settings - -Include if your extension adds any VS Code settings through the `contributes.configuration` extension point. - -For example: - -This extension contributes the following settings: - -* `myExtension.enable`: enable/disable this extension -* `myExtension.thing`: set to `blah` to do something - -## Known Issues - -Calling out known issues can help limit users opening duplicate issues against your extension. - -## Release Notes - -Users appreciate release notes as you update your extension. - -### 1.0.0 - -Initial release of ... - -### 1.0.1 - -Fixed issue #. - -### 1.1.0 - -Added features X, Y, and Z. - ------------------------------------------------------------------------------------------------------------ - -## Working with Markdown - -**Note:** You can author your README using Visual Studio Code. Here are some useful editor keyboard shortcuts: - -* Split the editor (`Cmd+\` on macOS or `Ctrl+\` on Windows and Linux) -* Toggle preview (`Shift+CMD+V` on macOS or `Shift+Ctrl+V` on Windows and Linux) -* Press `Ctrl+Space` (Windows, Linux) or `Cmd+Space` (macOS) to see a list of Markdown snippets - -### For more information - -* [Visual Studio Code's Markdown Support](http://code.visualstudio.com/docs/languages/markdown) -* [Markdown Syntax Reference](https://help.github.com/articles/markdown-basics/) - -**Enjoy!** +See https://github.com/CatalaLang/catala on how to install the Catala compiler. From 830f9fc84a6417675bf6950127f3500b986b0478 Mon Sep 17 00:00:00 2001 From: Louis Gesbert Date: Tue, 21 May 2024 11:23:25 +0200 Subject: [PATCH 3/4] vscode extension: add registered publisher name --- syntax_highlighting/vscode/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/syntax_highlighting/vscode/package.json b/syntax_highlighting/vscode/package.json index a81ae995..c5aadf18 100644 --- a/syntax_highlighting/vscode/package.json +++ b/syntax_highlighting/vscode/package.json @@ -1,6 +1,7 @@ { "name": "catala", "displayName": "Catala", + "publisher": "catalalang", "description": "Syntax highlighting for Catala programs", "version": "0.10.0", "license": "Apache-2.0", From 6322e5c001bea638dab326b17cb8be4e5f582da4 Mon Sep 17 00:00:00 2001 From: Louis Gesbert Date: Tue, 21 May 2024 11:43:00 +0200 Subject: [PATCH 4/4] VScode: add LICENSE.txt before publication --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c0491102..2eb9f1e1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,6 +13,6 @@ jobs: uses: actions/checkout@v4 - name: Publish VS Code extension working-directory: syntax_highlighting/vscode - run: npx vsce publish + run: ln -s ../../LICENSE.txt . && npx vsce publish env: VSCE_PAT: ${{ secrets.VSCE_PAT }}