Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions src/containers/ruby-tab/koshien-snippets.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
"snippet": "koshien.connect_game(name: ${1:\"player1\"})",
"description": "プレイヤー名を (player1) にして、ゲームサーバへ接続する"
},
"koshien.set_message": {
"snippet": "koshien.set_message(${1:\"hello\"})",
"description": "メッセージを (hello) にする"
},
"koshien.move_to": {
"snippet": "koshien.move_to(${1:\"0:0\"})",
"description": "座標 (0:0) に移動する"
Expand Down
5 changes: 5 additions & 0 deletions src/lib/ruby-generator/koshien.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,10 @@ export default function (Generator) {
return [`koshien.object(${object})`];
};

Generator.koshien_setMessage = function (block) {
const message = Generator.valueToCode(block, 'MESSAGE', Generator.ORDER_NONE) || Generator.quote_('hello');
return `koshien.set_message(${message})\n`;
};

return Generator;
}
10 changes: 10 additions & 0 deletions src/lib/ruby-to-blocks-converter/koshien.js
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,16 @@ const KoshienConverter = {
converter.addField(block, 'OBJECT', args[0]);
return block;
});

converter.registerOnSend(Koshien, 'set_message', 1, params => {
const {receiver, args} = params;

if (!converter.isStringOrBlock(args[0])) return null;

const block = converter.changeRubyExpressionBlock(receiver, 'koshien_setMessage', 'statement');
converter.addTextInput(block, 'MESSAGE', args[0], 'hello');
return block;
});
}
};

Expand Down
1 change: 1 addition & 0 deletions test/integration/ruby-tab/extension_koshien.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ describe('Ruby Tab: Koshien extension blocks', () => {
koshien.locate_objects(result: list("$地形・アイテム"), sq_size: 3, cent: "1:2", objects: "ABCD")
koshien.locate_objects(result: nil, sq_size: 3, cent: "1:2", objects: "ABCD")
koshien.turn_over
koshien.set_message("こんにちは")

koshien.position_of_x("0:1")

Expand Down
58 changes: 58 additions & 0 deletions test/unit/lib/ruby-to-blocks-converter/koshien.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
import RubyToBlocksConverter from '../../../../src/lib/ruby-to-blocks-converter';
import {
convertAndExpectToEqualBlocks,
convertAndExpectRubyBlockError,
rubyToExpected,
expectedInfo
} from '../../../helpers/expect-to-equal-blocks';

describe('RubyToBlocksConverter/Koshien', () => {
let converter;
let target;

beforeEach(() => {
converter = new RubyToBlocksConverter(null);
target = null;
});

test('koshien_setMessage', () => {
let code;
let expected;

code = 'koshien.set_message("hello")';
expected = [
{
opcode: 'koshien_setMessage',
inputs: [
{
name: 'MESSAGE',
block: expectedInfo.makeText('hello')
}
]
}
];
convertAndExpectToEqualBlocks(converter, target, code, expected);

code = 'koshien.set_message(x)';
expected = [
{
opcode: 'koshien_setMessage',
inputs: [
{
name: 'MESSAGE',
block: rubyToExpected(converter, target, 'x')[0],
shadow: expectedInfo.makeText('hello')
}
]
}
];
convertAndExpectToEqualBlocks(converter, target, code, expected);

[
'koshien.set_message()',
'koshien.set_message("hello", "world")'
].forEach(s => {
convertAndExpectRubyBlockError(converter, target, s);
});
});
});
Loading