fullheightcoding
diff --git a/Collapse file
‎scripts/buildProtocol.ts‎
Copy file name to clipboardExpand all lines: scripts/buildProtocol.ts
+9-5Lines changed: 9 additions & 5 deletions b/Collapse file
‎scripts/buildProtocol.ts‎
Copy file name to clipboardExpand all lines: scripts/buildProtocol.ts
+9-5Lines changed: 9 additions & 5 deletions
diff --git a/Collapse file
‎src/server/protocol.ts‎
Copy file name to clipboardExpand all lines: src/server/protocol.ts
+4Lines changed: 4 additions & 0 deletions b/Collapse file
‎src/server/protocol.ts‎
Copy file name to clipboardExpand all lines: src/server/protocol.ts
+4Lines changed: 4 additions & 0 deletions
@@ -7,19 +7,23 @@ function endsWith(s: string, suffix: string) {
     return s.lastIndexOf(suffix, s.length - suffix.length) !== -1;
 }
 
+function isStringEnum(declaration: ts.EnumDeclaration) {
+    return declaration.members.length && declaration.members.every(m => m.initializer && m.initializer.kind === ts.SyntaxKind.StringLiteral);
+}
+
 class DeclarationsWalker {
     private visitedTypes: ts.Type[] = [];
     private text = "";
     private removedTypes: ts.Type[] = [];
-    
+
     private constructor(private typeChecker: ts.TypeChecker, private protocolFile: ts.SourceFile) {
     }
 
     static getExtraDeclarations(typeChecker: ts.TypeChecker, protocolFile: ts.SourceFile): string {
         let text = "declare namespace ts.server.protocol {\n";
         var walker = new DeclarationsWalker(typeChecker, protocolFile);
         walker.visitTypeNodes(protocolFile);
-        text = walker.text 
+        text = walker.text
             ? `declare namespace ts.server.protocol {\n${walker.text}}`
             : "";
         if (walker.removedTypes) {
@@ -52,7 +56,7 @@ class DeclarationsWalker {
                 if (sourceFile === this.protocolFile || path.basename(sourceFile.fileName) === "lib.d.ts") {
                     return;
                 }
-                if (decl.kind === ts.SyntaxKind.EnumDeclaration) {
+                if (decl.kind === ts.SyntaxKind.EnumDeclaration && !isStringEnum(decl as ts.EnumDeclaration)) {
                     this.removedTypes.push(type);
                     return;
                 }
@@ -91,7 +95,7 @@ class DeclarationsWalker {
                         for (const type of heritageClauses[0].types) {
                             this.processTypeOfNode(type);
                         }
-                    } 
+                    }
                     break;
             }
         }
@@ -110,7 +114,7 @@ class DeclarationsWalker {
                 this.processType(type);
             }
         }
-    } 
+    }
 }
 
 function writeProtocolFile(outputFile: string, protocolTs: string, typeScriptServicesDts: string) {
 
@@ -2489,6 +2489,7 @@ namespace ts.server.protocol {
         System = "System",
         ES6 = "ES6",
         ES2015 = "ES2015",
+        ESNext = "ESNext"
     }
 
     export const enum ModuleResolutionKind {
@@ -2506,5 +2507,8 @@ namespace ts.server.protocol {
         ES5 = "ES5",
         ES6 = "ES6",
         ES2015 = "ES2015",
+        ES2016 = "ES2016",
+        ES2017 = "ES2017",
+        ESNext = "ESNext"
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -7,19 +7,23 @@ function endsWith(s: string, suffix: string) {`
`7`	`7`	`return s.lastIndexOf(suffix, s.length - suffix.length) !== -1;`
`8`	`8`	`}`
`9`	`9`
	`10`	`+function isStringEnum(declaration: ts.EnumDeclaration) {`
	`11`	`+ return declaration.members.length && declaration.members.every(m => m.initializer && m.initializer.kind === ts.SyntaxKind.StringLiteral);`
	`12`	`+}`
	`13`	`+`
`10`	`14`	`class DeclarationsWalker {`
`11`	`15`	`private visitedTypes: ts.Type[] = [];`
`12`	`16`	`private text = "";`
`13`	`17`	`private removedTypes: ts.Type[] = [];`
`14`		`-`
	`18`	`+`
`15`	`19`	`private constructor(private typeChecker: ts.TypeChecker, private protocolFile: ts.SourceFile) {`
`16`	`20`	`}`
`17`	`21`
`18`	`22`	`static getExtraDeclarations(typeChecker: ts.TypeChecker, protocolFile: ts.SourceFile): string {`
`19`	`23`	`let text = "declare namespace ts.server.protocol {\n";`
`20`	`24`	`var walker = new DeclarationsWalker(typeChecker, protocolFile);`
`21`	`25`	`walker.visitTypeNodes(protocolFile);`
`22`		`- text = walker.text`
	`26`	`+ text = walker.text`
`23`	`27`	? `declare namespace ts.server.protocol {\n${walker.text}}`
`24`	`28`	`: "";`
`25`	`29`	`if (walker.removedTypes) {`
`@@ -52,7 +56,7 @@ class DeclarationsWalker {`
`52`	`56`	`if (sourceFile === this.protocolFile \|\| path.basename(sourceFile.fileName) === "lib.d.ts") {`
`53`	`57`	`return;`
`54`	`58`	`}`
`55`		`- if (decl.kind === ts.SyntaxKind.EnumDeclaration) {`
	`59`	`+ if (decl.kind === ts.SyntaxKind.EnumDeclaration && !isStringEnum(decl as ts.EnumDeclaration)) {`
`56`	`60`	`this.removedTypes.push(type);`
`57`	`61`	`return;`
`58`	`62`	`}`
`@@ -91,7 +95,7 @@ class DeclarationsWalker {`
`91`	`95`	`for (const type of heritageClauses[0].types) {`
`92`	`96`	`this.processTypeOfNode(type);`
`93`	`97`	`}`
`94`		`- }`
	`98`	`+ }`
`95`	`99`	`break;`
`96`	`100`	`}`
`97`	`101`	`}`
`@@ -110,7 +114,7 @@ class DeclarationsWalker {`
`110`	`114`	`this.processType(type);`
`111`	`115`	`}`
`112`	`116`	`}`
`113`		`- }`
	`117`	`+ }`
`114`	`118`	`}`
`115`	`119`
`116`	`120`	`function writeProtocolFile(outputFile: string, protocolTs: string, typeScriptServicesDts: string) {`
Original file line number	Diff line number	Diff line change
`@@ -2489,6 +2489,7 @@ namespace ts.server.protocol {`
`2489`	`2489`	`System = "System",`
`2490`	`2490`	`ES6 = "ES6",`
`2491`	`2491`	`ES2015 = "ES2015",`
	`2492`	`+ ESNext = "ESNext"`
`2492`	`2493`	`}`
`2493`	`2494`
`2494`	`2495`	`export const enum ModuleResolutionKind {`
`@@ -2506,5 +2507,8 @@ namespace ts.server.protocol {`
`2506`	`2507`	`ES5 = "ES5",`
`2507`	`2508`	`ES6 = "ES6",`
`2508`	`2509`	`ES2015 = "ES2015",`
	`2510`	`+ ES2016 = "ES2016",`
	`2511`	`+ ES2017 = "ES2017",`
	`2512`	`+ ESNext = "ESNext"`
`2509`	`2513`	`}`
`2510`	`2514`	`}`