diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js index 5a2eb75d6b4..d4ab203a1fd 100644 --- a/build/npm/postinstall.js +++ b/build/npm/postinstall.js @@ -30,6 +30,7 @@ const extensions = [ 'extension-editing', 'markdown', 'typescript', + 'typescript-basics', 'php', 'javascript', 'css', diff --git a/extensions/typescript-basics/.vscodeignore b/extensions/typescript-basics/.vscodeignore new file mode 100644 index 00000000000..d257eda277b --- /dev/null +++ b/extensions/typescript-basics/.vscodeignore @@ -0,0 +1,4 @@ +build/** +src/** +test/** +tsconfig.json \ No newline at end of file diff --git a/extensions/typescript-basics/OSSREADME.json b/extensions/typescript-basics/OSSREADME.json new file mode 100644 index 00000000000..160da003cd8 --- /dev/null +++ b/extensions/typescript-basics/OSSREADME.json @@ -0,0 +1,7 @@ +[{ + "name": "TypeScript-TmLanguage", + "version": "0.1.8", + "license": "MIT", + "repositoryURL": "https://github.com/Microsoft/TypeScript-TmLanguage", + "description": "The files syntaxes/TypeScript.tmLanguage.json and syntaxes/TypeScriptReact.tmLanguage.json were derived from TypeScript.tmLanguage and TypeScriptReact.tmLanguage in https://github.com/Microsoft/TypeScript-TmLanguage." +}] diff --git a/extensions/typescript/build/update-grammars.js b/extensions/typescript-basics/build/update-grammars.js similarity index 100% rename from extensions/typescript/build/update-grammars.js rename to extensions/typescript-basics/build/update-grammars.js diff --git a/extensions/typescript-basics/language-configuration.json b/extensions/typescript-basics/language-configuration.json new file mode 100644 index 00000000000..1e8f440a420 --- /dev/null +++ b/extensions/typescript-basics/language-configuration.json @@ -0,0 +1,34 @@ +{ + "comments": { + "lineComment": "//", + "blockComment": [ "/*", "*/" ] + }, + "brackets": [ + ["{", "}"], + ["[", "]"], + ["(", ")"] + ], + "autoClosingPairs": [ + { "open": "{", "close": "}" }, + { "open": "[", "close": "]" }, + { "open": "(", "close": ")" }, + { "open": "'", "close": "'", "notIn": ["string", "comment"] }, + { "open": "\"", "close": "\"", "notIn": ["string"] }, + { "open": "`", "close": "`", "notIn": ["string", "comment"] }, + { "open": "/**", "close": " */", "notIn": ["string"] } + ], + "surroundingPairs": [ + ["{", "}"], + ["[", "]"], + ["(", ")"], + ["'", "'"], + ["\"", "\""], + ["`", "`"] + ], + "folding": { + "markers": { + "start": "^\\s*//\\s*#?region\\b", + "end": "^\\s*//\\s*#?endregion\\b" + } + } +} \ No newline at end of file diff --git a/extensions/typescript-basics/package.json b/extensions/typescript-basics/package.json new file mode 100644 index 00000000000..ec8fbdea9de --- /dev/null +++ b/extensions/typescript-basics/package.json @@ -0,0 +1,60 @@ +{ + "name": "typescript-basics", + "description": "%description%", + "displayName": "%displayName%", + "version": "0.10.1", + "author": "vscode", + "publisher": "vscode", + "license": "MIT", + "engines": { + "vscode": "*" + }, + "scripts": { + "update-grammar": "node ./build/update-grammars.js" + }, + "contributes": { + "languages": [ + { + "id": "typescript", + "aliases": [ + "TypeScript", + "ts", + "typescript" + ], + "extensions": [ + ".ts" + ], + "configuration": "./language-configuration.json" + }, + { + "id": "typescriptreact", + "aliases": [ + "TypeScript React", + "tsx" + ], + "extensions": [ + ".tsx" + ], + "configuration": "./language-configuration.json" + } + ], + "grammars": [ + { + "language": "typescript", + "scopeName": "source.ts", + "path": "./syntaxes/TypeScript.tmLanguage.json" + }, + { + "language": "typescriptreact", + "scopeName": "source.tsx", + "path": "./syntaxes/TypeScriptReact.tmLanguage.json", + "embeddedLanguages": { + "meta.tag.tsx": "jsx-tags", + "meta.tag.without-attributes.tsx": "jsx-tags", + "meta.tag.attributes.tsx": "typescriptreact", + "meta.embedded.expression.tsx": "typescriptreact" + } + } + ] + } +} \ No newline at end of file diff --git a/extensions/typescript-basics/package.nls.json b/extensions/typescript-basics/package.nls.json new file mode 100644 index 00000000000..bef9b695781 --- /dev/null +++ b/extensions/typescript-basics/package.nls.json @@ -0,0 +1,4 @@ +{ + "displayName": "TypeScript Language Basics", + "description": "Provides syntax highlighting and basic language support for TypeScript." +} \ No newline at end of file diff --git a/extensions/typescript/schemas/tsconfig.schema.json b/extensions/typescript-basics/schemas/tsconfig.schema.json similarity index 100% rename from extensions/typescript/schemas/tsconfig.schema.json rename to extensions/typescript-basics/schemas/tsconfig.schema.json diff --git a/extensions/typescript/snippets/typescript.json b/extensions/typescript-basics/snippets/typescript.json similarity index 100% rename from extensions/typescript/snippets/typescript.json rename to extensions/typescript-basics/snippets/typescript.json diff --git a/extensions/typescript/syntaxes/Readme.md b/extensions/typescript-basics/syntaxes/Readme.md similarity index 100% rename from extensions/typescript/syntaxes/Readme.md rename to extensions/typescript-basics/syntaxes/Readme.md diff --git a/extensions/typescript/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json similarity index 100% rename from extensions/typescript/syntaxes/TypeScript.tmLanguage.json rename to extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json diff --git a/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json similarity index 100% rename from extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json rename to extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json diff --git a/extensions/typescript/test/colorize-fixtures/test-brackets.tsx b/extensions/typescript-basics/test/colorize-fixtures/test-brackets.tsx similarity index 100% rename from extensions/typescript/test/colorize-fixtures/test-brackets.tsx rename to extensions/typescript-basics/test/colorize-fixtures/test-brackets.tsx diff --git a/extensions/typescript/test/colorize-fixtures/test-function-inv.ts b/extensions/typescript-basics/test/colorize-fixtures/test-function-inv.ts similarity index 100% rename from extensions/typescript/test/colorize-fixtures/test-function-inv.ts rename to extensions/typescript-basics/test/colorize-fixtures/test-function-inv.ts diff --git a/extensions/typescript/test/colorize-fixtures/test-issue11.ts b/extensions/typescript-basics/test/colorize-fixtures/test-issue11.ts similarity index 100% rename from extensions/typescript/test/colorize-fixtures/test-issue11.ts rename to extensions/typescript-basics/test/colorize-fixtures/test-issue11.ts diff --git a/extensions/typescript/test/colorize-fixtures/test-issue5431.ts b/extensions/typescript-basics/test/colorize-fixtures/test-issue5431.ts similarity index 100% rename from extensions/typescript/test/colorize-fixtures/test-issue5431.ts rename to extensions/typescript-basics/test/colorize-fixtures/test-issue5431.ts diff --git a/extensions/typescript/test/colorize-fixtures/test-issue5465.ts b/extensions/typescript-basics/test/colorize-fixtures/test-issue5465.ts similarity index 100% rename from extensions/typescript/test/colorize-fixtures/test-issue5465.ts rename to extensions/typescript-basics/test/colorize-fixtures/test-issue5465.ts diff --git a/extensions/typescript/test/colorize-fixtures/test-issue5566.ts b/extensions/typescript-basics/test/colorize-fixtures/test-issue5566.ts similarity index 100% rename from extensions/typescript/test/colorize-fixtures/test-issue5566.ts rename to extensions/typescript-basics/test/colorize-fixtures/test-issue5566.ts diff --git a/extensions/typescript/test/colorize-fixtures/test-keywords.ts b/extensions/typescript-basics/test/colorize-fixtures/test-keywords.ts similarity index 100% rename from extensions/typescript/test/colorize-fixtures/test-keywords.ts rename to extensions/typescript-basics/test/colorize-fixtures/test-keywords.ts diff --git a/extensions/typescript/test/colorize-fixtures/test-members.ts b/extensions/typescript-basics/test/colorize-fixtures/test-members.ts similarity index 100% rename from extensions/typescript/test/colorize-fixtures/test-members.ts rename to extensions/typescript-basics/test/colorize-fixtures/test-members.ts diff --git a/extensions/typescript/test/colorize-fixtures/test-object-literals.ts b/extensions/typescript-basics/test/colorize-fixtures/test-object-literals.ts similarity index 100% rename from extensions/typescript/test/colorize-fixtures/test-object-literals.ts rename to extensions/typescript-basics/test/colorize-fixtures/test-object-literals.ts diff --git a/extensions/typescript/test/colorize-fixtures/test-strings.ts b/extensions/typescript-basics/test/colorize-fixtures/test-strings.ts similarity index 100% rename from extensions/typescript/test/colorize-fixtures/test-strings.ts rename to extensions/typescript-basics/test/colorize-fixtures/test-strings.ts diff --git a/extensions/typescript/test/colorize-fixtures/test-this.ts b/extensions/typescript-basics/test/colorize-fixtures/test-this.ts similarity index 100% rename from extensions/typescript/test/colorize-fixtures/test-this.ts rename to extensions/typescript-basics/test/colorize-fixtures/test-this.ts diff --git a/extensions/typescript/test/colorize-fixtures/test.ts b/extensions/typescript-basics/test/colorize-fixtures/test.ts similarity index 100% rename from extensions/typescript/test/colorize-fixtures/test.ts rename to extensions/typescript-basics/test/colorize-fixtures/test.ts diff --git a/extensions/typescript/test/colorize-fixtures/tsconfig.json b/extensions/typescript-basics/test/colorize-fixtures/tsconfig.json similarity index 100% rename from extensions/typescript/test/colorize-fixtures/tsconfig.json rename to extensions/typescript-basics/test/colorize-fixtures/tsconfig.json diff --git a/extensions/typescript/test/colorize-results/test-brackets_tsx.json b/extensions/typescript-basics/test/colorize-results/test-brackets_tsx.json similarity index 100% rename from extensions/typescript/test/colorize-results/test-brackets_tsx.json rename to extensions/typescript-basics/test/colorize-results/test-brackets_tsx.json diff --git a/extensions/typescript/test/colorize-results/test-function-inv_ts.json b/extensions/typescript-basics/test/colorize-results/test-function-inv_ts.json similarity index 100% rename from extensions/typescript/test/colorize-results/test-function-inv_ts.json rename to extensions/typescript-basics/test/colorize-results/test-function-inv_ts.json diff --git a/extensions/typescript/test/colorize-results/test-issue11_ts.json b/extensions/typescript-basics/test/colorize-results/test-issue11_ts.json similarity index 100% rename from extensions/typescript/test/colorize-results/test-issue11_ts.json rename to extensions/typescript-basics/test/colorize-results/test-issue11_ts.json diff --git a/extensions/typescript/test/colorize-results/test-issue5431_ts.json b/extensions/typescript-basics/test/colorize-results/test-issue5431_ts.json similarity index 100% rename from extensions/typescript/test/colorize-results/test-issue5431_ts.json rename to extensions/typescript-basics/test/colorize-results/test-issue5431_ts.json diff --git a/extensions/typescript/test/colorize-results/test-issue5465_ts.json b/extensions/typescript-basics/test/colorize-results/test-issue5465_ts.json similarity index 100% rename from extensions/typescript/test/colorize-results/test-issue5465_ts.json rename to extensions/typescript-basics/test/colorize-results/test-issue5465_ts.json diff --git a/extensions/typescript/test/colorize-results/test-issue5566_ts.json b/extensions/typescript-basics/test/colorize-results/test-issue5566_ts.json similarity index 100% rename from extensions/typescript/test/colorize-results/test-issue5566_ts.json rename to extensions/typescript-basics/test/colorize-results/test-issue5566_ts.json diff --git a/extensions/typescript/test/colorize-results/test-keywords_ts.json b/extensions/typescript-basics/test/colorize-results/test-keywords_ts.json similarity index 100% rename from extensions/typescript/test/colorize-results/test-keywords_ts.json rename to extensions/typescript-basics/test/colorize-results/test-keywords_ts.json diff --git a/extensions/typescript/test/colorize-results/test-members_ts.json b/extensions/typescript-basics/test/colorize-results/test-members_ts.json similarity index 100% rename from extensions/typescript/test/colorize-results/test-members_ts.json rename to extensions/typescript-basics/test/colorize-results/test-members_ts.json diff --git a/extensions/typescript/test/colorize-results/test-object-literals_ts.json b/extensions/typescript-basics/test/colorize-results/test-object-literals_ts.json similarity index 100% rename from extensions/typescript/test/colorize-results/test-object-literals_ts.json rename to extensions/typescript-basics/test/colorize-results/test-object-literals_ts.json diff --git a/extensions/typescript/test/colorize-results/test-strings_ts.json b/extensions/typescript-basics/test/colorize-results/test-strings_ts.json similarity index 100% rename from extensions/typescript/test/colorize-results/test-strings_ts.json rename to extensions/typescript-basics/test/colorize-results/test-strings_ts.json diff --git a/extensions/typescript/test/colorize-results/test-this_ts.json b/extensions/typescript-basics/test/colorize-results/test-this_ts.json similarity index 100% rename from extensions/typescript/test/colorize-results/test-this_ts.json rename to extensions/typescript-basics/test/colorize-results/test-this_ts.json diff --git a/extensions/typescript/test/colorize-results/test_ts.json b/extensions/typescript-basics/test/colorize-results/test_ts.json similarity index 100% rename from extensions/typescript/test/colorize-results/test_ts.json rename to extensions/typescript-basics/test/colorize-results/test_ts.json diff --git a/extensions/typescript/test/colorize-results/tsconfig_json.json b/extensions/typescript-basics/test/colorize-results/tsconfig_json.json similarity index 100% rename from extensions/typescript/test/colorize-results/tsconfig_json.json rename to extensions/typescript-basics/test/colorize-results/tsconfig_json.json diff --git a/extensions/typescript/package.json b/extensions/typescript/package.json index 91ff774c1bf..cc06450f7d1 100644 --- a/extensions/typescript/package.json +++ b/extensions/typescript/package.json @@ -21,8 +21,7 @@ "@types/semver": "5.4.0" }, "scripts": { - "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:typescript ./tsconfig.json", - "update-grammar": "node ./build/update-grammars.js" + "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:typescript ./tsconfig.json" }, "activationEvents": [ "onLanguage:javascript", @@ -40,49 +39,6 @@ ], "main": "./out/extension", "contributes": { - "languages": [ - { - "id": "typescript", - "aliases": [ - "TypeScript", - "ts", - "typescript" - ], - "extensions": [ - ".ts" - ], - "configuration": "./language-configuration.json" - }, - { - "id": "typescriptreact", - "aliases": [ - "TypeScript React", - "tsx" - ], - "extensions": [ - ".tsx" - ], - "configuration": "./language-configuration.json" - } - ], - "grammars": [ - { - "language": "typescript", - "scopeName": "source.ts", - "path": "./syntaxes/TypeScript.tmLanguage.json" - }, - { - "language": "typescriptreact", - "scopeName": "source.tsx", - "path": "./syntaxes/TypeScriptReact.tmLanguage.json", - "embeddedLanguages": { - "meta.tag.tsx": "jsx-tags", - "meta.tag.without-attributes.tsx": "jsx-tags", - "meta.tag.attributes.tsx": "typescriptreact", - "meta.embedded.expression.tsx": "typescriptreact" - } - } - ], "configuration": { "type": "object", "title": "%configuration.typescript%",