Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'

lib/vscode/extensions/fsharp/.vscodeignore

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

lib/vscode/extensions/fsharp/cgmanifest.json

@@ -0,0 +1,18 @@
+{
+	"registrations": [
+		{
+			"component": {
+				"type": "git",
+				"git": {
+					"name": "ionide/ionide-fsgrammar",
+					"repositoryUrl": "https://github.com/ionide/ionide-fsgrammar",
+					"commitHash": "af037b23ca4c61b02799957a61cbd05b44355caf"
+				}
+			},
+			"license": "MIT",
+			"description": "The file syntaxes/fsharp.json was included from https://github.com/ionide/ionide-fsgrammar/blob/master/grammar/fsharp.json.",
+			"version": "0.0.0"
+		}
+	],
+	"version": 1
+}

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

@@ -0,0 +1,31 @@
+{
+	"comments": {
+		"lineComment": "//",
+		"blockComment": [ "(*", "*)" ]
+	},
+	"brackets": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"]
+	],
+	"autoClosingPairs": [
+		{ "open": "{", "close": "}" },
+		{ "open": "[", "close": "]" },
+		{ "open": "(", "close": ")" },
+		{ "open": "\"", "close": "\"", "notIn": ["string"] }
+	],
+	"surroundingPairs": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		["\"", "\""],
+		["'", "'"]
+	],
+	"folding": {
+		"offSide": true,
+		"markers": {
+			"start": "^\\s*//\\s*#region\\b|^\\s*\\(\\*\\s*#region(.*)\\*\\)",
+			"end": "^\\s*//\\s*#endregion\\b|^\\s*\\(\\*\\s*#endregion\\s*\\*\\)"
+		}
+	}
+}

lib/vscode/extensions/fsharp/package.json

@@ -0,0 +1,29 @@
+{
+	"name": "fsharp",
+	"displayName": "%displayName%",
+	"description": "%description%",
+	"version": "1.0.0",
+	"publisher": "vscode",
+	"license": "MIT",
+	"engines": { "vscode": "*" },
+	"scripts": {
+		"update-grammar": "node ../../build/npm/update-grammar.js ionide/ionide-fsgrammar grammar/fsharp.json ./syntaxes/fsharp.tmLanguage.json"
+	},
+	"contributes": {
+		"languages": [{
+			"id": "fsharp",
+			"extensions": [ ".fs", ".fsi", ".fsx", ".fsscript" ],
+			"aliases": [ "F#", "FSharp", "fsharp" ],
+			"configuration": "./language-configuration.json"
+		}],
+		"grammars": [{
+			"language": "fsharp",
+			"scopeName": "source.fsharp",
+			"path": "./syntaxes/fsharp.tmLanguage.json"
+		}],
+		"snippets": [{
+			"language": "fsharp",
+			"path": "./snippets/fsharp.code-snippets"
+		}]
+	}
+}

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

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

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

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

lib/vscode/extensions/fsharp/test/colorize-fixtures/test.fs

@@ -0,0 +1,18 @@
+// from https://msdn.microsoft.com/en-us/library/dd233160.aspx
+
+// The declaration creates a constructor that takes two values, name and age.
+type Person(name:string, age:int) =
+    let mutable internalAge = age
+
+    new(name:string) = Person(name, 0)
+
+    member this.Name = name
+    // A read/write property.
+    member this.Age
+        with get() = internalAge
+        and set(value) = internalAge <- value
+
+    member this.HasABirthday () = internalAge <- internalAge + 1
+    member this.IsOfAge targetAge = internalAge >= targetAge
+    override this.ToString () =
+        "Name:  " + name + "\n" + "Age:   " + (string)internalAge