Update to 0.10.9

5 files changed, 30 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e4038c5f6d6b..dfe8c4e887ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Feb 18 05:06:45 UTC 2016
+# Fri Feb 26 17:26:06 UTC 2016
 pkgbase = visual-studio-code-oss
 	pkgdesc = Visual Studio Code for Linux, Open Source version
-	pkgver = 0.10.8
-	pkgrel = 2
+	pkgver = 0.10.9
+	pkgrel = 1
 	url = https://code.visualstudio.com/
 	arch = i686
 	arch = x86_64
@@ -15,13 +15,13 @@ pkgbase = visual-studio-code-oss
 	depends = gconf
 	provides = vscode-oss
 	conflicts = vscode-oss
-	source = https://github.com/Microsoft/vscode/archive/0.10.8.tar.gz
+	source = https://github.com/Microsoft/vscode/archive/0.10.9.tar.gz
 	source = visual-studio-code-oss.desktop
-	source = fix_omnisharp_ext.patch
+	source = fix_super.patch
 	source = product_json.patch
-	sha1sums = fd74fcc6a16b19c11dc80620fdf2ea2eca7b3118
-	sha1sums = fba307396d3550beff64760bd7a6dec7e90ce0b9
-	sha1sums = 59dbb5cd20fe1c63bd63a019bfac6d2f6ca9e7ee
+	sha1sums = 94c6fa5db974d26e769e1f80a24f996424de7041
+	sha1sums = 2039174831d5483050471d69e0765b684cbeeefe
+	sha1sums = d51635bd1e9568eb31224170b10d48154dcc2c8c
 	sha1sums = 4a7f41876a016ef8d969fb81c7b1b4bc7b1e026b
 
 pkgname = visual-studio-code-oss
diff --git a/PKGBUILD b/PKGBUILD
index 2b0b4ba03505..8798371248c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=visual-studio-code-oss
 pkgdesc='Visual Studio Code for Linux, Open Source version'
-pkgver=0.10.8
-pkgrel=2
+pkgver=0.10.9
+pkgrel=1
 arch=('i686' 'x86_64')
 url='https://code.visualstudio.com/'
 license=('MIT')
@@ -14,11 +14,11 @@ provides=('vscode-oss')
 
 source=("https://github.com/Microsoft/vscode/archive/${pkgver}.tar.gz"
         "${pkgname}.desktop"
-        'fix_omnisharp_ext.patch'
+        'fix_super.patch'
         'product_json.patch')
-sha1sums=('fd74fcc6a16b19c11dc80620fdf2ea2eca7b3118'
-          'fba307396d3550beff64760bd7a6dec7e90ce0b9'
-          '59dbb5cd20fe1c63bd63a019bfac6d2f6ca9e7ee'
+sha1sums=('94c6fa5db974d26e769e1f80a24f996424de7041'
+          '2039174831d5483050471d69e0765b684cbeeefe'
+          'd51635bd1e9568eb31224170b10d48154dcc2c8c'
           '4a7f41876a016ef8d969fb81c7b1b4bc7b1e026b')
 
 case "$CARCH" in
@@ -37,7 +37,7 @@ esac
 prepare() {
     cd "${srcdir}/vscode-${pkgver}"
 
-    patch -p1 -i "${srcdir}/fix_omnisharp_ext.patch"
+    patch -p1 -i "${srcdir}/fix_super.patch"
     patch -p1 -i "${srcdir}/product_json.patch"
 }
 
diff --git a/fix_omnisharp_ext.patch b/fix_omnisharp_ext.patch
deleted file mode 100644
index 3efee9cecdb0..000000000000
--- a/fix_omnisharp_ext.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
---- a/build/gulpfile.vscode.js	2016-02-17 16:20:46.522632538 -0800
-+++ b/build/gulpfile.vscode.js	2016-02-17 16:21:54.609301270 -0800
-@@ -39,7 +39,7 @@ var baseModules = [
- // Build
- 
- var builtInExtensions = {
--	'jrieken.vscode-omnisharp': '0.3.2',
-+	'ms-vscode.omnisharp': '0.3.2',
- };
- 
- var vscodeEntryPoints = _.flatten([
diff --git a/fix_super.patch b/fix_super.patch
new file mode 100644
index 000000000000..1bbbf480a3ed
--- /dev/null
+++ b/fix_super.patch
@@ -0,0 +1,14 @@
+diff -rupN a/extensions/json/server/src/jsonParser.ts b/extensions/json/server/src/jsonParser.ts
+--- a/extensions/json/server/src/jsonParser.ts	2016-02-26 09:16:56.627621647 -0800
++++ b/extensions/json/server/src/jsonParser.ts	2016-02-26 09:17:12.304288787 -0800
+@@ -418,9 +418,9 @@ export class StringASTNode extends ASTNo
+ 	public value: string;
+ 
+ 	constructor(parent: ASTNode, name: string, isKey: boolean, start: number, end?: number) {
++		super(parent, 'string', name, start, end);
+ 		this.isKey = isKey;
+ 		this.value = '';
+-		super(parent, 'string', name, start, end);
+ 	}
+ 
+ 	public getValue(): any {
diff --git a/visual-studio-code-oss.desktop b/visual-studio-code-oss.desktop
index bd1ab8fd1be5..11e94cd00b90 100644
--- a/visual-studio-code-oss.desktop
+++ b/visual-studio-code-oss.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Visual Studio Code (Open Source)
-Version=0.10.8
+Version=0.10.9
 Exec="/opt/VSCode-OSS/Code - OSS" %F
 Icon=/opt/VSCode-OSS/resources/app/resources/linux/code.png
 Type=Application