Merge branch 'master' into removeOptionalTypeOnExportDefault

Author: mhegazy

src/compiler/utilities.ts

@@ -780,6 +780,8 @@ module ts {
                         return node === (<TemplateSpan>parent).expression;
                     case SyntaxKind.ComputedPropertyName:
                         return node === (<ComputedPropertyName>parent).expression;
+                    case SyntaxKind.Decorator:
+                        return true;
                     default:
                         if (isExpression(parent)) {
                             return true;

src/harness/harnessLanguageService.ts

@@ -336,6 +336,9 @@ module Harness.LanguageService {
         getOccurrencesAtPosition(fileName: string, position: number): ts.ReferenceEntry[] {
             return unwrapJSONCallResult(this.shim.getOccurrencesAtPosition(fileName, position));
         }
+        getDocumentHighlights(fileName: string, position: number, filesToSearch: string[]): ts.DocumentHighlights[] {
+            return unwrapJSONCallResult(this.shim.getDocumentHighlights(fileName, position, JSON.stringify(filesToSearch)));
+        }
         getNavigateToItems(searchValue: string): ts.NavigateToItem[] {
             return unwrapJSONCallResult(this.shim.getNavigateToItems(searchValue));
         }

src/server/client.ts

@@ -488,6 +488,10 @@ module ts.server {
             });
         }
 
+        getDocumentHighlights(fileName: string, position: number): DocumentHighlights[] {
+            throw new Error("Not Implemented Yet.");
+        }
+
         getOutliningSpans(fileName: string): OutliningSpan[] {
             throw new Error("Not Implemented Yet.");
         }

src/services/services.ts

@@ -135,11 +135,21 @@ module ts {
         findReferences(fileName: string, position: number): string;
 
         /**
+         * @deprecated
          * Returns a JSON-encoded value of the type:
          * { fileName: string; textSpan: { start: number; length: number}; isWriteAccess: boolean }[]
          */
         getOccurrencesAtPosition(fileName: string, position: number): string;
 
+        /**
+         * Returns a JSON-encoded value of the type:
+         * { fileName: string; highlights: { start: number; length: number, isDefinition: boolean }[] }[]
+         * 
+         * @param fileToSearch A JSON encoded string[] containing the file names that should be 
+         *  considered when searching.
+         */
+        getDocumentHighlights(fileName: string, position: number, filesToSearch: string): string;
+
         /**
          * Returns a JSON-encoded value of the type:
          * { name: string; kind: string; kindModifiers: string; containerName: string; containerKind: string; matchKind: string; fileName: string; textSpan: { start: number; length: number}; } [] = [];
@@ -590,6 +600,14 @@ module ts {
                 });
         }
 
+        public getDocumentHighlights(fileName: string, position: number, filesToSearch: string): string {
+            return this.forwardJSONCall(
+                "getDocumentHighlights('" + fileName + "', " + position + ")",
+                () => {
+                    return this.languageService.getDocumentHighlights(fileName, position, JSON.parse(filesToSearch));
+                });
+        }
+
         /// COMPLETION LISTS
 
         /**

src/services/shims.ts

@@ -7,7 +7,7 @@ declare function dec<T>(target: T): T;
 >T : T
 
 @dec
->dec : unknown
+>dec : <T>(target: T) => T
 
 class C {
 >C : C

tests/baselines/reference/decoratorOnClass1.types

@@ -7,7 +7,7 @@ declare function dec<T>(target: T): T;
 >T : T
 
 @dec
->dec : unknown
+>dec : <T>(target: T) => T
 
 export class C {
 >C : C

tests/baselines/reference/decoratorOnClass2.types

@@ -14,6 +14,6 @@ class C {
 >C : C
 
     @dec get accessor() { return 1; }
->dec : unknown
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
 >accessor : number
 }

tests/baselines/reference/decoratorOnClassAccessor1.types

@@ -14,6 +14,6 @@ class C {
 >C : C
 
     @dec public get accessor() { return 1; }
->dec : unknown
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
 >accessor : number
 }

tests/baselines/reference/decoratorOnClassAccessor2.types

@@ -14,7 +14,7 @@ class C {
 >C : C
 
     @dec set accessor(value: number) { }
->dec : unknown
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
 >accessor : number
 >value : number
 }