Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'

lib/vscode/extensions/java/.vscodeignore

@@ -0,0 +1,2 @@
+test/**
+cgmanifest.json

lib/vscode/extensions/java/cgmanifest.json

@@ -0,0 +1,17 @@
+{
+	"registrations": [
+		{
+			"component": {
+				"type": "git",
+				"git": {
+					"name": "atom/language-java",
+					"repositoryUrl": "https://github.com/atom/language-java",
+					"commitHash": "2bd3e55a72b08e171f811a2445343e2df9d89b71"
+				}
+			},
+			"license": "MIT",
+			"version": "0.32.0"
+		}
+	],
+	"version": 1
+}

lib/vscode/extensions/java/language-configuration.json

@@ -0,0 +1,33 @@
+{
+	"comments": {
+		"lineComment": "//",
+		"blockComment": [ "/*", "*/" ]
+	},
+	"brackets": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"]
+	],
+	"autoClosingPairs": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		{ "open": "\"", "close": "\"", "notIn": ["string"] },
+		{ "open": "'", "close": "'", "notIn": ["string"] },
+		{ "open": "/**", "close": " */", "notIn": ["string"] }
+	],
+	"surroundingPairs": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		["\"", "\""],
+		["'", "'"],
+		["<", ">"]
+	],
+	"folding": {
+		"markers": {
+			"start": "^\\s*//\\s*(?:(?:#?region\\b)|(?:<editor-fold\\b))",
+			"end": "^\\s*//\\s*(?:(?:#?endregion\\b)|(?:</editor-fold>))"
+		}
+	}
+}

lib/vscode/extensions/java/package.json

@@ -0,0 +1,29 @@
+{
+	"name": "java",
+	"displayName": "%displayName%",
+	"description": "%description%",
+	"version": "1.0.0",
+	"publisher": "vscode",
+	"license": "MIT",
+	"engines": { "vscode": "*" },
+	"scripts": {
+		"update-grammar": "node ../../build/npm/update-grammar.js atom/language-java grammars/java.cson ./syntaxes/java.tmLanguage.json"
+	},
+	"contributes": {
+		"languages": [{
+			"id": "java",
+			"extensions": [ ".java", ".jav" ],
+			"aliases": [ "Java", "java" ],
+			"configuration": "./language-configuration.json"
+		}],
+		"grammars": [{
+			"language": "java",
+			"scopeName": "source.java",
+			"path": "./syntaxes/java.tmLanguage.json"
+		}],
+		"snippets": [{
+			"language": "java",
+			"path": "./snippets/java.code-snippets"
+		}]
+	}
+}

lib/vscode/extensions/java/package.nls.json

@@ -0,0 +1,4 @@
+{
+	"displayName": "Java Language Basics",
+	"description": "Provides snippets, syntax highlighting, bracket matching and folding in Java files."
+}

lib/vscode/extensions/java/snippets/java.code-snippets

@@ -0,0 +1,16 @@
+{
+	"Region Start": {
+		"prefix": "#region",
+		"body": [
+			"//#region"
+		],
+		"description": "Folding Region Start"
+	},
+	"Region End": {
+		"prefix": "#endregion",
+		"body": [
+			"//#endregion"
+		],
+		"description": "Folding Region End"
+	}
+}

lib/vscode/extensions/java/test/colorize-fixtures/basic.java

@@ -0,0 +1,42 @@
+package foo;
+
+import org.junit.Test;
+import org.junit.runners.*;
+
+/*
+ * Multi line comment
+ */
+public class TestClass {
+
+	private String aString;
+
+	/**
+	 * <p>Note:</p> Hello
+	 * @param args
+	 */
+	public void doSomething(int a) {
+		double b = 0.0;
+		double c = 10e3;
+		long l = 134l;
+	}
+
+	/*
+	 * multiline comment
+	 */
+	@SuppressWarnings(value = "aString")
+	private long privateMethod(long b){
+		for (int i = 0; i < 9; i++) {
+			System.out.println("Hello" + i);
+		}
+		return 10;
+	}
+
+	//single line comment
+	@Test
+	public void someTests() {
+		int hex = 0x5;
+		Vector<Number> v = new Vector();
+	}
+
+
+}