Add global functions to completionItemProvider.

mattacosta · mattacosta · commit d330c3f29d42 · 2018-04-14T07:05:26.000-07:00
diff --git a/extensions/php-language-features/src/features/completionItemProvider.ts b/extensions/php-language-features/src/features/completionItemProvider.ts
@@ -7,6 +7,7 @@
 
 import { CompletionItemProvider, CompletionItem, CompletionItemKind, CancellationToken, TextDocument, Position, Range, TextEdit, workspace, CompletionContext } from 'vscode';
 import phpGlobals = require('./phpGlobals');
+import phpGlobalFunctions = require('./phpGlobalFunctions');
 
 export default class PHPCompletionItemProvider implements CompletionItemProvider {
 
@@ -69,10 +70,10 @@ export default class PHPCompletionItemProvider implements CompletionItemProvider
 				result.push(createNewProposal(CompletionItemKind.Variable, globalvariables, phpGlobals.globalvariables[globalvariables]));
 			}
 		}
-		for (var globalfunctions in phpGlobals.globalfunctions) {
-			if (phpGlobals.globalfunctions.hasOwnProperty(globalfunctions) && matches(globalfunctions)) {
+		for (var globalfunctions in phpGlobalFunctions.globalfunctions) {
+			if (phpGlobalFunctions.globalfunctions.hasOwnProperty(globalfunctions) && matches(globalfunctions)) {
 				added[globalfunctions] = true;
-				result.push(createNewProposal(CompletionItemKind.Function, globalfunctions, phpGlobals.globalfunctions[globalfunctions]));
+				result.push(createNewProposal(CompletionItemKind.Function, globalfunctions, phpGlobalFunctions.globalfunctions[globalfunctions]));
 			}
 		}
 		for (var compiletimeconstants in phpGlobals.compiletimeconstants) {

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`import { CompletionItemProvider, CompletionItem, CompletionItemKind, CancellationToken, TextDocument, Position, Range, TextEdit, workspace, CompletionContext } from 'vscode';`
`9`	`9`	`import phpGlobals = require('./phpGlobals');`
	`10`	`+import phpGlobalFunctions = require('./phpGlobalFunctions');`
`10`	`11`
`11`	`12`	`export default class PHPCompletionItemProvider implements CompletionItemProvider {`
`12`	`13`
`@@ -69,10 +70,10 @@ export default class PHPCompletionItemProvider implements CompletionItemProvider`
`69`	`70`	`result.push(createNewProposal(CompletionItemKind.Variable, globalvariables, phpGlobals.globalvariables[globalvariables]));`
`70`	`71`	`}`
`71`	`72`	`}`
`72`		`- for (var globalfunctions in phpGlobals.globalfunctions) {`
`73`		`- if (phpGlobals.globalfunctions.hasOwnProperty(globalfunctions) && matches(globalfunctions)) {`
	`73`	`+ for (var globalfunctions in phpGlobalFunctions.globalfunctions) {`
	`74`	`+ if (phpGlobalFunctions.globalfunctions.hasOwnProperty(globalfunctions) && matches(globalfunctions)) {`
`74`	`75`	`added[globalfunctions] = true;`
`75`		`- result.push(createNewProposal(CompletionItemKind.Function, globalfunctions, phpGlobals.globalfunctions[globalfunctions]));`
	`76`	`+ result.push(createNewProposal(CompletionItemKind.Function, globalfunctions, phpGlobalFunctions.globalfunctions[globalfunctions]));`
`76`	`77`	`}`
`77`	`78`	`}`
`78`	`79`	`for (var compiletimeconstants in phpGlobals.compiletimeconstants) {`