From 14e6a9f19a3179bf9c7f5914b230b88c455ca4c9 Mon Sep 17 00:00:00 2001
From: jens1o <jenshausdorf@gmail.com>
Date: Mon, 10 Apr 2017 14:14:20 +0200
Subject: [PATCH] change setting field to php

---
 package.json     | 3 +--
 src/extension.ts | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 56dbb59..1e8339e 100644
--- a/package.json
+++ b/package.json
@@ -57,9 +57,8 @@
   },
   "contributes": {
     "configuration": {
-      "title": "PHP-Intellisense",
       "properties": {
-        "phpintellisense.memoryLimit": {
+        "php.memoryLimit": {
           "type": "string",
           "default": "-1",
           "description": "The memory limit of the php language server. [Number][K|M|G]. Use '-1' to allow unlimited use of the RAM(default)."
diff --git a/src/extension.ts b/src/extension.ts
index 1931fc1..0c75f34 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -12,9 +12,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     const conf = vscode.workspace.getConfiguration('php');
     const executablePath = conf.get<string>('executablePath') || 'php';
 
-    const specificSettings = vscode.workspace.getConfiguration('phpintellisense');
-
-    const memoryLimit = specificSettings.get<string>('memoryLimit') || '-1';
+    const memoryLimit = conf.get<string>('memoryLimit') || '-1';
 
     if (memoryLimit !== '-1' && !memoryLimit.match('~^(\d+)(K|M|G|)$~')) {
         const selected = await vscode.window.showErrorMessage(