Merge branch 'release-1.5'

JsonFreeman · JsonFreeman · commit 7b5550725a63 · 2015-07-15T16:08:11.000-07:00
diff --git a/bin/tsserver.js b/bin/tsserver.js
@@ -35052,6 +35052,12 @@ var ts;
                     var newSourceFile = ts.updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks);
                     setSourceFileFields(newSourceFile, scriptSnapshot, version);
                     newSourceFile.nameTable = undefined;
+                    if (sourceFile !== newSourceFile && sourceFile.scriptSnapshot) {
+                        if (sourceFile.scriptSnapshot.dispose) {
+                            sourceFile.scriptSnapshot.dispose();
+                        }
+                        sourceFile.scriptSnapshot = undefined;
+                    }
                     return newSourceFile;
                 }
             }
diff --git a/bin/typescript.d.ts b/bin/typescript.d.ts
@@ -1591,6 +1591,8 @@ declare module "typescript" {
          * not happen and the entire document will be re - parsed.
          */
         getChangeRange(oldSnapshot: IScriptSnapshot): TextChangeRange;
+        /** Releases all resources held by this script snapshot */
+        dispose?(): void;
     }
     module ScriptSnapshot {
         function fromString(text: string): IScriptSnapshot;
diff --git a/bin/typescript.js b/bin/typescript.js
@@ -41389,6 +41389,13 @@ var ts;
                     // after incremental parsing nameTable might not be up-to-date
                     // drop it so it can be lazily recreated later
                     newSourceFile.nameTable = undefined;
+                    // dispose all resources held by old script snapshot
+                    if (sourceFile !== newSourceFile && sourceFile.scriptSnapshot) {
+                        if (sourceFile.scriptSnapshot.dispose) {
+                            sourceFile.scriptSnapshot.dispose();
+                        }
+                        sourceFile.scriptSnapshot = undefined;
+                    }
                     return newSourceFile;
                 }
             }
@@ -46760,6 +46767,13 @@ var ts;
             var decoded = JSON.parse(encoded);
             return ts.createTextChangeRange(ts.createTextSpan(decoded.span.start, decoded.span.length), decoded.newLength);
         };
+        ScriptSnapshotShimAdapter.prototype.dispose = function () {
+            // if scriptSnapshotShim is a COM object then property check becomes method call with no arguments
+            // 'in' does not have this effect
+            if ("dispose" in this.scriptSnapshotShim) {
+                this.scriptSnapshotShim.dispose();
+            }
+        };
         return ScriptSnapshotShimAdapter;
     })();
     var LanguageServiceShimHostAdapter = (function () {
diff --git a/bin/typescriptServices.d.ts b/bin/typescriptServices.d.ts
@@ -1591,6 +1591,8 @@ declare namespace ts {
          * not happen and the entire document will be re - parsed.
          */
         getChangeRange(oldSnapshot: IScriptSnapshot): TextChangeRange;
+        /** Releases all resources held by this script snapshot */
+        dispose?(): void;
     }
     module ScriptSnapshot {
         function fromString(text: string): IScriptSnapshot;
diff --git a/bin/typescriptServices.js b/bin/typescriptServices.js
@@ -41389,6 +41389,13 @@ var ts;
                     // after incremental parsing nameTable might not be up-to-date
                     // drop it so it can be lazily recreated later
                     newSourceFile.nameTable = undefined;
+                    // dispose all resources held by old script snapshot
+                    if (sourceFile !== newSourceFile && sourceFile.scriptSnapshot) {
+                        if (sourceFile.scriptSnapshot.dispose) {
+                            sourceFile.scriptSnapshot.dispose();
+                        }
+                        sourceFile.scriptSnapshot = undefined;
+                    }
                     return newSourceFile;
                 }
             }
@@ -46760,6 +46767,13 @@ var ts;
             var decoded = JSON.parse(encoded);
             return ts.createTextChangeRange(ts.createTextSpan(decoded.span.start, decoded.span.length), decoded.newLength);
         };
+        ScriptSnapshotShimAdapter.prototype.dispose = function () {
+            // if scriptSnapshotShim is a COM object then property check becomes method call with no arguments
+            // 'in' does not have this effect
+            if ("dispose" in this.scriptSnapshotShim) {
+                this.scriptSnapshotShim.dispose();
+            }
+        };
         return ScriptSnapshotShimAdapter;
     })();
     var LanguageServiceShimHostAdapter = (function () {

Original file line number	Diff line number	Diff line change
`@@ -35052,6 +35052,12 @@ var ts;`
`35052`	`35052`	`var newSourceFile = ts.updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks);`
`35053`	`35053`	`setSourceFileFields(newSourceFile, scriptSnapshot, version);`
`35054`	`35054`	`newSourceFile.nameTable = undefined;`
	`35055`	`+ if (sourceFile !== newSourceFile && sourceFile.scriptSnapshot) {`
	`35056`	`+ if (sourceFile.scriptSnapshot.dispose) {`
	`35057`	`+ sourceFile.scriptSnapshot.dispose();`
	`35058`	`+ }`
	`35059`	`+ sourceFile.scriptSnapshot = undefined;`
	`35060`	`+ }`
`35055`	`35061`	`return newSourceFile;`
`35056`	`35062`	`}`
`35057`	`35063`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1591,6 +1591,8 @@ declare module "typescript" {`
`1591`	`1591`	`* not happen and the entire document will be re - parsed.`
`1592`	`1592`	`*/`
`1593`	`1593`	`getChangeRange(oldSnapshot: IScriptSnapshot): TextChangeRange;`
	`1594`	`+ /** Releases all resources held by this script snapshot */`
	`1595`	`+ dispose?(): void;`
`1594`	`1596`	`}`
`1595`	`1597`	`module ScriptSnapshot {`
`1596`	`1598`	`function fromString(text: string): IScriptSnapshot;`
Original file line number	Diff line number	Diff line change
`@@ -1591,6 +1591,8 @@ declare namespace ts {`
`1591`	`1591`	`* not happen and the entire document will be re - parsed.`
`1592`	`1592`	`*/`
`1593`	`1593`	`getChangeRange(oldSnapshot: IScriptSnapshot): TextChangeRange;`
	`1594`	`+ /** Releases all resources held by this script snapshot */`
	`1595`	`+ dispose?(): void;`
`1594`	`1596`	`}`
`1595`	`1597`	`module ScriptSnapshot {`
`1596`	`1598`	`function fromString(text: string): IScriptSnapshot;`