Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: aiscript-dev/aiscript-vscode
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.1.8
Choose a base ref
...
head repository: aiscript-dev/aiscript-vscode
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on May 13, 2024

  1. Copy the full SHA
    a549978 View commit details
  2. Release v0.1.9

    kakkokari-gtyih committed May 13, 2024
    Copy the full SHA
    34bf4e1 View commit details

Commits on Jun 8, 2024

  1. Copy the full SHA
    7ea251c View commit details

Commits on Jun 27, 2024

  1. Release v0.1.10

    kakkokari-gtyih committed Jun 27, 2024
    Copy the full SHA
    702d28a View commit details

Commits on Jul 12, 2024

  1. Copy the full SHA
    c6f5a30 View commit details
  2. Copy the full SHA
    f24b999 View commit details
  3. Release: v0.1.11

    kakkokari-gtyih committed Jul 12, 2024
    Copy the full SHA
    e1e1b27 View commit details

Commits on Aug 11, 2024

  1. Release v0.1.12 (#14)

    * Update array.ts
    
    * Update package.json
    
    * Update CHANGELOG.md
    
    * Update package-lock.json
    
    * Update outdated docs
    
    * ignore
    kakkokari-gtyih authored Aug 11, 2024
    Copy the full SHA
    6641304 View commit details

Commits on Nov 28, 2024

  1. branding

    kakkokari-gtyih committed Nov 28, 2024
    Copy the full SHA
    49de418 View commit details
  2. Copy the full SHA
    62e5cc5 View commit details
  3. 🎨

    kakkokari-gtyih committed Nov 28, 2024
    Copy the full SHA
    84043ff View commit details

Commits on Dec 4, 2024

  1. Copy the full SHA
    b1db387 View commit details
  2. Update Changelog

    kakkokari-gtyih committed Dec 4, 2024
    Copy the full SHA
    7aa03ce View commit details

Commits on Dec 6, 2024

  1. Copy the full SHA
    f6a8f6e View commit details
  2. Release v0.1.13

    kakkokari-gtyih committed Dec 6, 2024
    Copy the full SHA
    8c8a7c1 View commit details

Commits on Dec 22, 2024

  1. update deps

    kakkokari-gtyih committed Dec 22, 2024
    Copy the full SHA
    c00fdb8 View commit details
  2. Copy the full SHA
    acb7dfe View commit details
  3. Release v0.1.14

    kakkokari-gtyih committed Dec 22, 2024
    Copy the full SHA
    b8ec99a View commit details

Commits on Jan 3, 2025

  1. Copy the full SHA
    bbf7d67 View commit details
  2. Release v0.1.15

    kakkokari-gtyih committed Jan 3, 2025
    Copy the full SHA
    c3cde89 View commit details

Commits on Jan 28, 2025

  1. Copy the full SHA
    7568744 View commit details
  2. Copy the full SHA
    f583e0a View commit details
  3. Release v0.1.16

    kakkokari-gtyih committed Jan 28, 2025
    Copy the full SHA
    1dc7f60 View commit details
Showing with 276 additions and 185 deletions.
  1. +2 −0 .vscodeignore
  2. +30 −0 CHANGELOG.md
  3. +2 −2 README.ja.md
  4. +2 −2 README.md
  5. +1 −0 aiscript/intellisense/functions/Obj.ts
  6. +1 −0 aiscript/intellisense/primitive/array.ts
  7. +52 −15 aiscript/syntaxes/aiscript.tmLanguage.json
  8. BIN assets/aiscript_gd.png
  9. +177 −162 package-lock.json
  10. +9 −4 package.json
2 changes: 2 additions & 0 deletions .vscodeignore
Original file line number Diff line number Diff line change
@@ -3,6 +3,8 @@
readme-assets/**
aiscript/intellisense/**
node_modules/**
scripts/**
.gitignore
*.vsix
vsc-extension-quickstart.md
tsconfig.json
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -4,6 +4,36 @@ All notable changes to the "aiscript" extension will be documented in this file.

Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.

## 0.1.16
- ハイライト:do-while, while, breakのサポート, ラベル構文のサポート
- 関数のIntellisenseを追加
- `Obj:pick`

## 0.1.15
- ネームスペース関数の引数でテンプレートリテラルがハイライトされない問題を修正

## 0.1.14
- 依存パッケージを更新
- 関数の引数にテンプレート文字列を取るとハイライトされない問題を修正

## 0.1.13
- AiScriptロゴを追加
- 名前空間ブロックのハイライトに対応
- テンプレートリテラル内の波括弧のエスケープが効いていない問題を修正

## 0.1.12
- 関数のIntellisenseを追加
- https://github.com/aiscript-dev/aiscript/pull/661 - `[].at()`

## 0.1.11
- 変数名に`let``var`などが含まれるときにハイライトに失敗する問題を修正

## 0.1.10
- tmLanguageの言語指定の後方互換性を追加

## 0.1.9
- `each`文が正しくhighlightされない問題を修正(#11

## 0.1.8
- 関数のIntellisenseを追加
- https://github.com/aiscript-dev/aiscript/pull/621 - `[].splice()`
4 changes: 2 additions & 2 deletions README.ja.md
Original file line number Diff line number Diff line change
@@ -33,9 +33,9 @@ CHANGELOG.md をご覧ください
$ npm i

# VSCEを使いvsixパッケージ化
$ npx vsce package
$ npx @vscode/vsce package

# もしnpxでうまくいかなければ、以下をお試しください:
$ npm install -g vsce
$ npm install -g @vscode/vsce
$ vsce package
```
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -35,9 +35,9 @@ Run:
$ npm i

# Pack into .vsix file using VSCE
$ npx vsce package
$ npx @vscode/vsce package

# (If command above didn't work, try below)
$ npm install -g vsce
$ npm install -g @vscode/vsce
$ vsce package
```
1 change: 1 addition & 0 deletions aiscript/intellisense/functions/Obj.ts
Original file line number Diff line number Diff line change
@@ -24,6 +24,7 @@ export default languages.registerCompletionItemProvider('aiscript', {
createCompletionItemKindMethod('has'),
createCompletionItemKindMethod('copy'),
createCompletionItemKindMethod('merge'),
createCompletionItemKindMethod('pick'),
];
}
}, ':');
1 change: 1 addition & 0 deletions aiscript/intellisense/primitive/array.ts
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@ export default languages.registerCompletionItemProvider('aiscript', {
createCompletionItemKindMethod('flat_map'),
createCompletionItemKindMethod('insert'),
createCompletionItemKindMethod('remove'),
createCompletionItemKindMethod('at'),
];
}
}, '.');
67 changes: 52 additions & 15 deletions aiscript/syntaxes/aiscript.tmLanguage.json
Original file line number Diff line number Diff line change
@@ -4,11 +4,18 @@
"displayName": "AiScript",
"aliases": [
"is",
"ais"
"ais",
"AiScript"
],
"patterns": [
{
"include": "#namespace"
},
{
"include": "#syntax"
},
{
"include": "#template-strings"
}
],
"repository": {
@@ -23,9 +30,6 @@
{
"include": "#strings"
},
{
"include": "#template-strings"
},
{
"include": "#declarations"
},
@@ -41,6 +45,9 @@
{
"include": "#presets"
},
{
"include": "#labels"
},
{
"include": "#variables"
}
@@ -50,15 +57,15 @@
"patterns": [
{
"name": "storage.type.aiscript",
"match": "(@|var|let|true|false|null|exists)|(^#{3}(?=\\s*\\{))"
"match": "(@|true|false|null|exists)|(^#{3}(?= +\\{))|((var|let)(?= +))"
}
]
},
"keywords": {
"patterns": [
{
"name": "keyword.control.aiscript",
"match": "(return|<:|if|elif|else|for|eval|loop|match)(?=[\\s(])"
"match": "(return|<:|break|if|elif|else|for|each|eval|loop|while|do|match)(?=[\\s(])"
}
]
},
@@ -74,6 +81,22 @@
}
]
},
"namespace": {
"patterns": [
{
"name": "meta.namespaceblock.aiscript",
"match": "^(:{2})\\s?([a-zA-Z0-9_]+)\\s?\\{",
"captures": {
"1": {
"name": "storage.type.aiscript"
},
"2": {
"name": "entity.name.class.aiscript"
}
}
}
]
},
"functions": {
"patterns": [
{
@@ -100,6 +123,9 @@
"patterns": [
{
"include": "#syntax"
},
{
"include": "#template-strings"
}
],
"end": "\\)"
@@ -115,6 +141,9 @@
"patterns": [
{
"include": "#syntax"
},
{
"include": "#template-strings"
}
],
"end": "\\)"
@@ -130,7 +159,7 @@
"patterns": [
{
"name": "constant.character.escape.aiscript",
"match": "\\\\."
"match": "\\\\['\"\\\\]"
}
]
},
@@ -141,7 +170,7 @@
"patterns": [
{
"name": "constant.character.escape.aiscript",
"match": "\\\\."
"match": "\\\\['\"\\\\]"
}
]
}
@@ -164,15 +193,19 @@
}
},
"patterns": [
{
"name": "constant.character.escape.aiscript",
"match": "\\\\['\"`\\\\{}]"
},
{
"name": "meta.string-template.aiscript",
"begin": "{",
"begin": "\\{",
"beginCaptures": {
"0": {
"name": "entity.name.tag.aiscript"
}
},
"end": "}",
"end": "\\}",
"endCaptures": {
"0": {
"name": "entity.name.tag.aiscript"
@@ -184,10 +217,6 @@
}
]
},
{
"name": "constant.character.escape.aiscript",
"match": "\\\\."
},
{
"name": "string.other.aiscript",
"match": "[^`{]+"
@@ -212,6 +241,14 @@
}
]
},
"labels": {
"patterns": [
{
"name": "entity.name.label.aiscript",
"match": "#[a-zA-Z][a-zA-Z0-9_]*"
}
]
},
"presets": {
"patterns": [
{
@@ -257,4 +294,4 @@
}
},
"scopeName": "source.aiscript"
}
}
Binary file added assets/aiscript_gd.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
339 changes: 177 additions & 162 deletions package-lock.json

Large diffs are not rendered by default.

13 changes: 9 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -3,11 +3,12 @@
"publisher": "aiscript-dev",
"displayName": "AiScript Highlighting",
"description": "Add support for AiScript",
"icon": "./assets/aiscript_gd.png",
"repository": {
"type": "git",
"url": "https://github.com/aiscript-dev/aiscript-vscode"
},
"version": "0.1.8",
"version": "0.1.16",
"engines": {
"vscode": "^1.83.0"
},
@@ -39,6 +40,10 @@
".is",
".ais"
],
"icon": {
"light": "./assets/aiscript_gd.png",
"dark": "./assets/aiscript_gd.png"
},
"configuration": "./aiscript/language-configuration.json"
}
],
@@ -51,10 +56,10 @@
]
},
"devDependencies": {
"@types/node": "^20.12.4",
"@types/node": "^22.10.2",
"@types/vscode": "^1.83.0",
"esbuild": "^0.20.2",
"typescript": "^5.4.4"
"esbuild": "^0.24.2",
"typescript": "^5.7.2"
},
"dependencies": {
"@aiscript-dev/aiscript-languageserver": "https://github.com/aiscript-dev/aiscript-languageserver/releases/download/0.1.6/aiscript-dev-aiscript-languageserver-0.1.6.tgz",