pull/2748/head
Alex Dima 8 years ago
parent 712fb631b5
commit f1f3088632

@ -0,0 +1,28 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Unit Tests",
"type": "node",
"request": "launch",
"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
"stopOnEntry": false,
"args": [
"--grep",
"php"
],
"cwd": "${workspaceRoot}",
"preLaunchTask": null,
"runtimeExecutable": null,
"runtimeArgs": [
"--nolazy"
],
"env": {
"NODE_ENV": "development"
},
"console": "internalConsole",
"sourceMaps": false,
"outDir": null
}
]
}

@ -16,6 +16,7 @@ Colorization and configuration supports for multiple languages for the Monaco Ed
* lua
* objective-c
* postiats
* php
* powershell
* python
* r

@ -61,6 +61,7 @@ gulp.task('release', ['clean-release','compile'], function() {
bundleOne('src/lua'),
bundleOne('src/markdown'),
bundleOne('src/objective-c'),
bundleOne('src/php'),
bundleOne('src/powershell'),
bundleOne('src/postiats'),
bundleOne('src/python'),

@ -143,6 +143,13 @@ registerLanguage({
aliases: [ 'ATS', 'ATS/Postiats' ],
module: './postiats'
});
registerLanguage({
id: 'php',
extensions: ['.php', '.php4', '.php5', '.phtml', '.ctp'],
aliases: ['PHP', 'php'],
mimetypes: ['application/x-php'],
module: './php'
});
registerLanguage({
id: 'powershell',
extensions: [ '.ps1', '.psm1', '.psd1' ],

@ -0,0 +1,418 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'use strict';
import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
import ILanguage = monaco.languages.IMonarchLanguage;
export var conf:IRichLanguageConfiguration = {
wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,
comments: {
lineComment: '//',
blockComment: ['/*', '*/']
},
brackets: [
['{', '}'],
['[', ']'],
['(', ')']
],
autoClosingPairs: [
{ open: '{', close: '}', notIn: ['string.php'] },
{ open: '[', close: ']', notIn: ['string.php'] },
{ open: '(', close: ')', notIn: ['string.php'] },
{ open: '"', close: '"', notIn: ['string.php'] },
{ open: '\'', close: '\'', notIn: ['string.php'] }
]
};
export const htmlTokenTypes = {
DELIM_START: 'start.delimiter.tag.html',
DELIM_END: 'end.delimiter.tag.html',
DELIM_COMMENT: 'comment.html',
getTag: (name: string) => {
return 'tag.html';
}
};
export var language = <ILanguage> {
defaultToken: '',
tokenPostfix: '',
// The main tokenizer for our languages
tokenizer: {
root: [
[/<\?((php)|=)?/, { token: '@rematch', switchTo: '@phpInSimpleState.root' }],
[/<!DOCTYPE/, 'metatag.html', '@doctype'],
[/<!--/, 'comment.html', '@comment'],
[/(<)(\w+)(\/>)/, [htmlTokenTypes.DELIM_START, 'tag.html', htmlTokenTypes.DELIM_END]],
[/(<)(script)/, [htmlTokenTypes.DELIM_START, { token: 'tag.html', next: '@script'} ]],
[/(<)(style)/, [htmlTokenTypes.DELIM_START, { token: 'tag.html', next: '@style'} ]],
[/(<)(\w+)/, [htmlTokenTypes.DELIM_START, { token: 'tag.html', next: '@otherTag'} ]],
[/(<\/)(\w+)/, [htmlTokenTypes.DELIM_START, { token: 'tag.html', next: '@otherTag' }]],
[/[^<]+/] // text
],
doctype: [
[/<\?((php)|=)?/, { token: '@rematch', switchTo: '@phpInSimpleState.comment' }],
[/[^>]+/, 'metatag.content.html' ],
[/>/, 'metatag.html', '@pop' ],
],
comment: [
[/<\?((php)|=)?/, { token: '@rematch', switchTo: '@phpInSimpleState.comment' }],
[/-->/, 'comment.html', '@pop'],
[/[^-]+/, 'comment.html'],
[/./, 'comment.html']
],
otherTag: [
[/<\?((php)|=)?/, { token: '@rematch', switchTo: '@phpInSimpleState.otherTag' }],
[/\/?>/, htmlTokenTypes.DELIM_END, '@pop'],
[/"([^"]*)"/, 'attribute.value'],
[/'([^']*)'/, 'attribute.value'],
[/[\w\-]+/, 'attribute.name'],
[/=/, 'delimiter'],
[/[ \t\r\n]+/], // whitespace
],
// -- BEGIN <script> tags handling
// After <script
script: [
[/<\?((php)|=)?/, { token: '@rematch', switchTo: '@phpInSimpleState.script' }],
[/type/, 'attribute.name', '@scriptAfterType'],
[/"([^"]*)"/, 'attribute.value'],
[/'([^']*)'/, 'attribute.value'],
[/[\w\-]+/, 'attribute.name'],
[/=/, 'delimiter'],
[/>/, { token: htmlTokenTypes.DELIM_END, next: '@scriptEmbedded.text/javascript', nextEmbedded: 'text/javascript'} ],
[/[ \t\r\n]+/], // whitespace
[/(<\/)(script\s*)(>)/, [ htmlTokenTypes.DELIM_START, 'tag.html', { token: htmlTokenTypes.DELIM_END, next: '@pop' } ]]
],
// After <script ... type
scriptAfterType: [
[/<\?((php)|=)?/, { token: '@rematch', switchTo: '@phpInSimpleState.scriptAfterType' }],
[/=/,'delimiter', '@scriptAfterTypeEquals'],
[/[ \t\r\n]+/], // whitespace
[/<\/script\s*>/, { token: '@rematch', next: '@pop' }]
],
// After <script ... type =
scriptAfterTypeEquals: [
[/<\?((php)|=)?/, { token: '@rematch', switchTo: '@phpInSimpleState.scriptAfterTypeEquals' }],
[/"([^"]*)"/, { token: 'attribute.value', switchTo: '@scriptWithCustomType.$1' } ],
[/'([^']*)'/, { token: 'attribute.value', switchTo: '@scriptWithCustomType.$1' } ],
[/[ \t\r\n]+/], // whitespace
[/<\/script\s*>/, { token: '@rematch', next: '@pop' }]
],
// After <script ... type = $S2
scriptWithCustomType: [
[/<\?((php)|=)?/, { token: '@rematch', switchTo: '@phpInSimpleState.scriptWithCustomType.$S2' }],
[/>/, { token: htmlTokenTypes.DELIM_END, next: '@scriptEmbedded.$S2', nextEmbedded: '$S2'}],
[/[ \t\r\n]+/], // whitespace
[/<\/script\s*>/, { token: '@rematch', next: '@pop' }]
],
scriptEmbedded: [
[/<\?((php)|=)?/, { token: '@rematch', switchTo: '@phpInEmbeddedState.scriptEmbedded.$S2', nextEmbedded: '@pop' }],
[/<\/script/, { token: '@rematch', next: '@pop', nextEmbedded: '@pop' }]
],
// -- END <script> tags handling
// -- BEGIN <style> tags handling
// After <style
style: [
[/<\?((php)|=)?/, { token: '@rematch', switchTo: '@phpInSimpleState.style' }],
[/type/, 'attribute.name', '@styleAfterType'],
[/"([^"]*)"/, 'attribute.value'],
[/'([^']*)'/, 'attribute.value'],
[/[\w\-]+/, 'attribute.name'],
[/=/, 'delimiter'],
[/>/, { token: htmlTokenTypes.DELIM_END, next: '@styleEmbedded.text/css', nextEmbedded: 'text/css'} ],
[/[ \t\r\n]+/], // whitespace
[/(<\/)(style\s*)(>)/, [htmlTokenTypes.DELIM_START, 'tag.html', { token: htmlTokenTypes.DELIM_END, next: '@pop' } ]]
],
// After <style ... type
styleAfterType: [
[/<\?((php)|=)?/, { token: '@rematch', switchTo: '@phpInSimpleState.styleAfterType' }],
[/=/,'delimiter', '@styleAfterTypeEquals'],
[/[ \t\r\n]+/], // whitespace
[/<\/style\s*>/, { token: '@rematch', next: '@pop' }]
],
// After <style ... type =
styleAfterTypeEquals: [
[/<\?((php)|=)?/, { token: '@rematch', switchTo: '@phpInSimpleState.styleAfterTypeEquals' }],
[/"([^"]*)"/, { token: 'attribute.value', switchTo: '@styleWithCustomType.$1' } ],
[/'([^']*)'/, { token: 'attribute.value', switchTo: '@styleWithCustomType.$1' } ],
[/[ \t\r\n]+/], // whitespace
[/<\/style\s*>/, { token: '@rematch', next: '@pop' }]
],
// After <style ... type = $S2
styleWithCustomType: [
[/<\?((php)|=)?/, { token: '@rematch', switchTo: '@phpInSimpleState.styleWithCustomType.$S2' }],
[/>/, { token: htmlTokenTypes.DELIM_END, next: '@styleEmbedded.$S2', nextEmbedded: '$S2'}],
[/[ \t\r\n]+/], // whitespace
[/<\/style\s*>/, { token: '@rematch', next: '@pop' }]
],
styleEmbedded: [
[/<\?((php)|=)?/, { token: '@rematch', switchTo: '@phpInEmbeddedState.styleEmbedded.$S2', nextEmbedded: '@pop' }],
[/<\/style/, { token: '@rematch', next: '@pop', nextEmbedded: '@pop' }]
],
// -- END <style> tags handling
phpInSimpleState: [
[/<\?((php)|=)?/, 'metatag.php'],
[/\?>/, { token: 'metatag.php', switchTo: '@$S2.$S3' }],
{ include: 'phpRoot' }
],
phpInEmbeddedState: [
[/<\?((php)|=)?/, 'metatag.php'],
[/\?>/, { token: 'metatag.php', switchTo: '@$S2.$S3', nextEmbedded: '$S3' }],
{ include: 'phpRoot' }
],
phpRoot: [
[/[a-zA-Z_]\w*/, {
cases: {
'@phpKeywords': { token:'keyword.php' },
'@phpCompileTimeConstants': { token: 'constant.php'},
'@default': 'identifier.php'
}
}],
[/[$a-zA-Z_]\w*/, {
cases: {
'@phpPreDefinedVariables': { token:'variable.predefined.php' },
'@default': 'variable.php'
}
}],
// brackets
[/[{}]/, 'delimiter.bracket.php' ],
[/[\[\]]/, 'delimiter.array.php' ],
[/[()]/, 'delimiter.parenthesis.php' ],
// whitespace
[/[ \t\r\n]+/],
// comments
[/#/, 'comment.php', '@phpLineComment'],
[/\/\//, 'comment.php', '@phpLineComment'],
// block comments
[/\/\*/, 'comment.php', '@phpComment' ],
// strings
[/"/, 'string.php', '@phpDoubleQuoteString' ],
[/'/, 'string.php', '@phpSingleQuoteString' ],
// delimiters
[/[\+\-\*\%\&\|\^\~\!\=\<\>\/\?\;\:\.\,\@]/, 'delimiter.php' ],
// numbers
[/\d*\d+[eE]([\-+]?\d+)?/, 'number.float.php'],
[/\d*\.\d+([eE][\-+]?\d+)?/, 'number.float.php'],
[/0[xX][0-9a-fA-F']*[0-9a-fA-F]/, 'number.hex.php'],
[/0[0-7']*[0-7]/, 'number.octal.php'],
[/0[bB][0-1']*[0-1]/, 'number.binary.php'],
[/\d[\d']*/, 'number.php'],
[/\d/, 'number.php'],
],
phpComment: [
[/\*\//, 'comment.php', '@pop'],
[/[^*]+/, 'comment.php'],
[/./, 'comment.php']
],
phpLineComment: [
[/\?>/, { token: '@rematch', next: '@pop' }],
[/.$/, 'comment.php', '@pop'],
[/[^?]+$/, 'comment.php', '@pop'],
[/[^?]+/, 'comment.php'],
[/./, 'comment.php']
],
phpDoubleQuoteString: [
[/[^\\"]+/, 'string.php'],
[/@escapes/, 'string.escape.php'],
[/\\./, 'string.escape.invalid.php'],
[/"/, 'string.php', '@pop' ]
],
phpSingleQuoteString: [
[/[^\\']+/, 'string.php'],
[/@escapes/, 'string.escape.php'],
[/\\./, 'string.escape.invalid.php'],
[/'/, 'string.php', '@pop' ]
],
},
phpKeywords: [
'abstract', 'and', 'array', 'as', 'break',
'callable', 'case', 'catch', 'cfunction', 'class', 'clone',
'const', 'continue', 'declare', 'default', 'do',
'else', 'elseif', 'enddeclare', 'endfor', 'endforeach',
'endif', 'endswitch', 'endwhile', 'extends', 'false', 'final',
'for', 'foreach', 'function', 'global', 'goto',
'if', 'implements', 'interface', 'instanceof', 'insteadof',
'namespace', 'new', 'null', 'object', 'old_function', 'or', 'private',
'protected', 'public', 'resource', 'static', 'switch', 'throw', 'trait',
'try', 'true', 'use', 'var', 'while', 'xor',
'die', 'echo', 'empty', 'exit', 'eval',
'include', 'include_once', 'isset', 'list', 'require',
'require_once', 'return', 'print', 'unset', 'yield',
'__construct'
],
phpCompileTimeConstants: [
'__CLASS__',
'__DIR__',
'__FILE__',
'__LINE__',
'__NAMESPACE__',
'__METHOD__',
'__FUNCTION__',
'__TRAIT__'
],
phpPreDefinedVariables: [
'$GLOBALS',
'$_SERVER',
'$_GET',
'$_POST',
'$_FILES',
'$_REQUEST',
'$_SESSION',
'$_ENV',
'$_COOKIE',
'$php_errormsg',
'$HTTP_RAW_POST_DATA',
'$http_response_header',
'$argc',
'$argv'
],
escapes: /\\(?:[abfnrtv\\"']|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,
};
// TESTED WITH
// <style type="text/css" >
// .boo { background: blue;
// <?=''?>
// }
// .boo { background: blue; <?=''?> }
// </style>
// <!--
// <?= '' ?>
// -->
// <?php
// // The next line contains a syntax error:
// __construct
// if () {
// return "The parser recovers from this type of syntax error";
// }
// ?>
// <html>
// <head>
// <title <?=''?>>Example page</title>
// <style <?=''?>>
// .boo { background: blue; <?=''?> }
// </style>
// </head>
// <body>
// <script <?=''?> type<?=''?>=<?=''?>"text/javascript"<?=''?>>
// // Some PHP embedded inside JS
// // Generated <?=date('l, F jS, Y')?>
// var server_token = <?=rand(5, 10000)?>
// if (typeof server_token === 'number') {
// alert('token: ' + server_token);
// }
// </script>
// <div>
// Hello
// <? if (isset($user)) { ?>
// <b><?=$user?></b>
// <? } else { ?>
// <i>guest</i>
// <? } ?>
// !
// </div>
// <?php
// /* Example PHP file
// multiline comment
// */
// # Another single line comment
// $cards = array("ah", "ac", "ad", "as",
// "2h", "2c", "2d", "2s",
// "3h", "3c", "3d", "3s",
// "4h", "4c", "4d", "4s",
// "5h", "5c", "5d", "5s",
// "6h", "6c", "6d", "6s",
// "7h", "7c", "7d", "7s",
// "8h", "8c", "8d", "8s",
// "9h", "9c", "9d", "9s",
// "th", "tc", "td", "ts",
// "jh", "jc", "jd", "js",
// "qh", "qc", "qd", "qs",
// "kh", "kc", "kd", "ks");
// srand(time());
// for($i = 0; $i < 52; $i++) {
// $count = count($cards);
// $random = (rand()%$count);
// if($cards[$random] == "") {
// $i--;
// } else {
// $deck[] = $cards[$random];
// $cards[$random] = "";
// }
// }
// $_GET
// __CLASS__
// srand(time());
// $starting_point = (rand()%51);
// print("Starting point for cut cards is: $starting_point<p>");
// // display shuffled cards (EXAMPLE ONLY)
// for ($index = 0; $index < 52; $index++) {
// if ($starting_point == 52) { $starting_point = 0; }
// print("Uncut Point: <strong>$deck[$index]</strong> ");
// print("Starting Point: <strong>$deck[$starting_point]</strong><br>");
// $starting_point++;
// }
// ?>
// </body>
// </html>

@ -35,6 +35,7 @@ requirejs([
'out/test/lua.test',
'out/test/markdown.test',
'out/test/objective-c.test',
'out/test/php.test',
'out/test/postiats.test',
'out/test/powershell.test',
'out/test/python.test',

File diff suppressed because it is too large Load Diff

@ -19,11 +19,18 @@ export interface ITestItem {
tokens: IRelaxedToken[];
}
export function testTokenization(languageId:string, tests:ITestItem[][]): void {
suite(languageId + ' tokenization', () => {
export function testTokenization(_language:string|string[], tests:ITestItem[][]): void {
let languages:string[];
if (typeof _language === 'string') {
languages = [_language];
} else {
languages = _language;
}
let mainLanguage = languages[0];
suite(mainLanguage + ' tokenization', () => {
test('', (done) => {
loadLanguage(languageId).then(() => {
runTests(languageId, tests);
_monaco.Promise.join(languages.map(l => loadLanguage(l))).then(() => {
runTests(mainLanguage, tests);
done();
}).then(null, done);
});

@ -28,6 +28,7 @@
"src/monaco.contribution.ts",
"src/objective-c.ts",
"src/postiats.ts",
"src/php.ts",
"src/powershell.ts",
"src/python.ts",
"src/r.ts",
@ -51,6 +52,7 @@
"test/markdown.test.ts",
"test/mocha.d.ts",
"test/objective-c.test.ts",
"test/php.test.ts",
"test/postiats.test.ts",
"test/powershell.test.ts",
"test/python.test.ts",

Loading…
Cancel
Save