microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 08:11:30 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #427 from sparecycles/fix/reference-static-regex

Browse Source 
fix: /// <reference path="..." static='true' />
This commit is contained in:
Mohamed Hegazy 2014-08-12 17:46:06 -07:00
commit 2a106bf923
6 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/compiler/precompile.ts
View File

@ -49,7 +49,7 @@ module TypeScript {
return isNoDefaultLibRegex.exec(comment);
}
export var tripleSlashReferenceRegExp = /^(\/\/\/\s*<reference\s+path=)('|")(.+?)\2\s*(static=('|")(.+?)\2\s*)*\/>/;
export var tripleSlashReferenceRegExp = /^(\/\/\/\s*<reference\s+path=)('|")(.+?)\2\s*(static=('|")(.+?)\5\s*)*\/>/;
function getFileReferenceFromReferencePath(fileName: string, text: ISimpleText, position: number, comment: string, diagnostics: Diagnostic[]): IFileReference {
// First, just see if they've written: /// <reference\s+

16
tests/baselines/reference/project/referencePathStatic/amd/referencePathStatic.json Normal file
View File

@ -0,0 +1,16 @@
{
"scenario": "Reference-path-static",
"projectRoot": "tests/cases/projects/reference-path-static",
"inputFiles": [
"test.ts"
],
"resolvedInputFiles": [
"test.ts",
"lib.ts",
"lib.d.ts"
],
"emittedFiles": [
"lib.js",
"test.js"
]
}

16
tests/baselines/reference/project/referencePathStatic/node/referencePathStatic.json Normal file
View File

@ -0,0 +1,16 @@
{
"scenario": "Reference-path-static",
"projectRoot": "tests/cases/projects/reference-path-static",
"inputFiles": [
"test.ts"
],
"resolvedInputFiles": [
"test.ts",
"lib.ts",
"lib.d.ts"
],
"emittedFiles": [
"lib.js",
"test.js"
]
}

7
tests/cases/project/referencePathStatic.json Normal file
View File

@ -0,0 +1,7 @@
{
"scenario": "Reference-path-static",
"projectRoot": "tests/cases/projects/reference-path-static",
"inputFiles": [
"test.ts"
]
}

3
tests/cases/projects/reference-path-static/lib.ts Normal file
View File

@ -0,0 +1,3 @@
module Lib {
export class LibType {}
}

3
tests/cases/projects/reference-path-static/test.ts Normal file
View File

@ -0,0 +1,3 @@
/// <reference path="lib.ts" static='true' />
var libType: Lib.LibType;