Merge branch 'master' into metaDataWithStringLiteral

Author: sheetalkamat

src/compiler/checker.ts

@@ -18456,6 +18456,9 @@ namespace ts {
                             (<ImportDeclaration>node.parent).moduleSpecifier === node)) {
                         return resolveExternalModuleName(node, <LiteralExpression>node);
                     }
+                    if (isInJavaScriptFile(node) && isRequireCall(node.parent, /*checkArgumentIsStringLiteral*/ false)) {
+                        return resolveExternalModuleName(node, <LiteralExpression>node);
+                    }
                 // Fall through
 
                 case SyntaxKind.NumericLiteral:

src/server/session.ts

@@ -1109,7 +1109,7 @@ namespace ts.server {
 
         private getNavigationBarItems(args: protocol.FileRequestArgs, simplifiedResult: boolean): protocol.NavigationBarItem[] | NavigationBarItem[] {
             const { file, project } = this.getFileAndProject(args);
-            const items = project.getLanguageService().getNavigationBarItems(file);
+            const items = project.getLanguageService(/*ensureSynchronized*/ false).getNavigationBarItems(file);
             if (!items) {
                 return undefined;
             }

src/services/completions.ts

@@ -24,7 +24,7 @@ namespace ts.Completions {
         const entries: CompletionEntry[] = [];
 
         if (isSourceFileJavaScript(sourceFile)) {
-            const uniqueNames = getCompletionEntriesFromSymbols(symbols, entries, location, /*performCharacterChecks*/ false);
+            const uniqueNames = getCompletionEntriesFromSymbols(symbols, entries, location, /*performCharacterChecks*/ true);
             addRange(entries, getJavaScriptCompletionEntries(sourceFile, location.pos, uniqueNames));
         }
         else {
@@ -138,7 +138,9 @@ namespace ts.Completions {
                 return undefined;
             }
 
-            if (node.parent.kind === SyntaxKind.PropertyAssignment && node.parent.parent.kind === SyntaxKind.ObjectLiteralExpression) {
+            if (node.parent.kind === SyntaxKind.PropertyAssignment &&
+                node.parent.parent.kind === SyntaxKind.ObjectLiteralExpression &&
+                (<PropertyAssignment>node.parent).name === node) {
                 // Get quoted name of properties of the object literal expression
                 // i.e. interface ConfigFiles {
                 //          'jspm:dev': string
@@ -1001,6 +1003,7 @@ namespace ts.Completions {
                 if ((jsxContainer.kind === SyntaxKind.JsxSelfClosingElement) || (jsxContainer.kind === SyntaxKind.JsxOpeningElement)) {
                     // Cursor is inside a JSX self-closing element or opening element
                     attrsType = typeChecker.getJsxElementAttributesType(<JsxOpeningLikeElement>jsxContainer);
+                    isGlobalCompletion = false;
 
                     if (attrsType) {
                         symbols = filterJsxAttributes(typeChecker.getPropertiesOfType(attrsType), (<JsxOpeningLikeElement>jsxContainer).attributes);

src/services/services.ts

@@ -1512,12 +1512,25 @@ namespace ts {
             return NavigationBar.getNavigationBarItems(sourceFile);
         }
 
+        function isTsOrTsxFile(fileName: string): boolean {
+            const kind = getScriptKind(fileName, host);
+            return kind === ScriptKind.TS || kind === ScriptKind.TSX;
+        }
+
         function getSemanticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[] {
+            if (!isTsOrTsxFile(fileName)) {
+                // do not run semantic classification on non-ts-or-tsx files
+                return [];
+            }
             synchronizeHostData();
             return ts.getSemanticClassifications(program.getTypeChecker(), cancellationToken, getValidSourceFile(fileName), program.getClassifiableNames(), span);
         }
 
         function getEncodedSemanticClassifications(fileName: string, span: TextSpan): Classifications {
+            if (!isTsOrTsxFile(fileName)) {
+                // do not run semantic classification on non-ts-or-tsx files
+                return { spans: [], endOfLineState: EndOfLineState.None };
+            }
             synchronizeHostData();
             return ts.getEncodedSemanticClassifications(program.getTypeChecker(), cancellationToken, getValidSourceFile(fileName), program.getClassifiableNames(), span);
         }

tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js

@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || function (d, b) {
 var ShortDetails = (function (_super) {
     __extends(ShortDetails, _super);
     function ShortDetails() {
-        _super.apply(this, arguments);
+        return _super.apply(this, arguments) || this;
     }
     ShortDetails.prototype.render = function () {
         if (this.props.id < 1) {

tests/cases/fourslash/completionListInObjectLiteralPropertyAssignment.ts

@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts' />
+
+////var foo;
+////interface I {
+////    metadata: string;
+////    wat: string;
+////}
+////var x: I = {
+////    metadata: "/*1*/
+////}
+
+goTo.marker('1');
+
+verify.not.completionListContains("metadata");
+verify.not.completionListContains("wat");

tests/cases/fourslash/completionListInvalidMemberNames3.ts

@@ -0,0 +1,71 @@
+/// <reference path='fourslash.ts' />
+
+// @allowjs: true
+
+// @Filename: test.js
+////interface Symbol {
+////    /** Returns a string representation of an object. */
+////    toString(): string;
+
+////    /** Returns the primitive value of the specified object. */
+////    valueOf(): Object;
+////}
+
+////interface SymbolConstructor {
+////    /** 
+////      * A reference to the prototype. 
+////      */
+////    readonly prototype: Symbol;
+
+////    /**
+////      * Returns a new unique Symbol value.
+////      * @param  description Description of the new Symbol object.
+////      */
+////    (description?: string | number): symbol;
+
+////    /**
+////      * Returns a Symbol object from the global symbol registry matching the given key if found. 
+////      * Otherwise, returns a new symbol with this key.
+////      * @param key key to search for.
+////      */
+////    for(key: string): symbol;
+
+////    /**
+////      * Returns a key from the global symbol registry matching the given Symbol if found. 
+////      * Otherwise, returns a undefined.
+////      * @param sym Symbol to find the key for.
+////      */
+////    keyFor(sym: symbol): string | undefined;
+////}
+
+////declare var Symbol: SymbolConstructor;/// <reference path="lib.es2015.symbol.d.ts" />
+
+////interface SymbolConstructor {
+////    /** 
+////      * A method that determines if a constructor object recognizes an object as one of the 
+////      * constructor’s instances. Called by the semantics of the instanceof operator. 
+////      */
+////    readonly hasInstance: symbol;
+////}
+
+////interface Function {
+////    /**
+////     * Determines whether the given value inherits from this function if this function was used
+////     * as a constructor function.
+////     *
+////     * A constructor function can control which objects are recognized as its instances by
+////     * 'instanceof' by overriding this method.
+////     */
+////    [Symbol.hasInstance](value: any): boolean;
+////}
+
+////interface SomeInterface {
+////    (value: number): any;
+////}
+
+////var _ : SomeInterface;
+////_./**/
+
+goTo.marker();
+
+verify.not.completionListContains("[Symbol.hasInstance]");

tests/cases/fourslash/completionListIsGlobalCompletion.ts

@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+//@Filename: file.tsx
 /////// <reference path="/*1*/..\services\services.ts" /> // no globals in reference paths
 ////import { /*2*/ } from "./file.ts";  // no globals in imports
 ////var test = "/*3*/"; // no globals in strings
@@ -20,6 +21,7 @@
 ////   /*9*/ // insert globals
 ////}
 /////*10*/ // insert globals
+////const y = <div /*11*/ />;
 goTo.marker("1");
 verify.completionListIsGlobal(false);
 goTo.marker("2");
@@ -40,3 +42,5 @@ goTo.marker("9");
 verify.completionListIsGlobal(true);
 goTo.marker("10");
 verify.completionListIsGlobal(true);
+goTo.marker("11");
+verify.completionListIsGlobal(false);

tests/cases/fourslash/goToDefinitionJsModuleName.ts

@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts'/>
+
+// @allowJs: true
+// @Filename: foo.js
+/////*2*/module.exports = {};
+
+// @Filename: bar.js
+////var x = require(/*1*/"./foo");
+
+verify.goToDefinition("1", "2");

tests/cases/fourslash/semanticClassificationJs.ts

@@ -0,0 +1,9 @@
+/// <reference path="fourslash.ts"/>
+
+// @Filename: app.js
+//// function foo() {
+//// }
+//// let x = 1;
+
+// no semantic classification in js file
+verify.semanticClassificationsAre();