From 72e4ba9ae2d68cde76d3df475b30948ddfb73e41 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Wed, 16 Mar 2016 13:07:46 +0100 Subject: [PATCH] fixes #3815: [php] autocomplete is not showing user variables --- extensions/php/src/features/completionItemProvider.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/php/src/features/completionItemProvider.ts b/extensions/php/src/features/completionItemProvider.ts index aafac986d7e..6a8c8902c7f 100644 --- a/extensions/php/src/features/completionItemProvider.ts +++ b/extensions/php/src/features/completionItemProvider.ts @@ -33,7 +33,7 @@ export default class PHPCompletionItemProvider implements CompletionItemProvider }; var matches = (name:string) => { - return prefix.length === 0 || name.length > prefix.length && name.substr(0, prefix.length) === prefix; + return prefix.length === 0 || name.length >= prefix.length && name.substr(0, prefix.length) === prefix; }; for (var name in phpGlobals.globalvariables) { @@ -62,7 +62,7 @@ export default class PHPCompletionItemProvider implements CompletionItemProvider } var text = document.getText(); - if (matches('$')) { + if (prefix[0] === '$') { var variableMatch = /\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)/g; var match : RegExpExecArray = null; while (match = variableMatch.exec(text)) {