Define printWidth at 100

microsoft · Sep 18, 2020 · bce6fe8 · bce6fe8
1 parent 078ee54
commit bce6fe8
Show file tree

Hide file tree

Showing 81 changed files with 290 additions and 1,156 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -3,5 +3,6 @@
 	"singleQuote": true,
 	"trailingComma": "none",
 	"semi": true,
-	"useTabs": true
+	"useTabs": true,
+	"printWidth": 100
 }
diff --git a/scripts/bundle.js b/scripts/bundle.js
@@ -22,10 +22,7 @@ const BUNDLED_FILE_HEADER = [
 ].join('\n');
 
 bundleOne('monaco.contribution');
-glob('out/amd/*/*.contribution.js', { cwd: path.dirname(__dirname) }, function (
-	err,
-	files
-) {
+glob('out/amd/*/*.contribution.js', { cwd: path.dirname(__dirname) }, function (err, files) {
 	if (err) {
 		console.log(err);
 		return;
@@ -52,14 +49,8 @@ function bundleOne(moduleId, exclude) {
 			optimize: 'none'
 		},
 		async function (buildResponse) {
-			const devFilePath = path.join(
-				REPO_ROOT,
-				'release/dev/' + moduleId + '.js'
-			);
-			const minFilePath = path.join(
-				REPO_ROOT,
-				'release/min/' + moduleId + '.js'
-			);
+			const devFilePath = path.join(REPO_ROOT, 'release/dev/' + moduleId + '.js');
+			const minFilePath = path.join(REPO_ROOT, 'release/min/' + moduleId + '.js');
 			const fileContents = fs.readFileSync(devFilePath).toString();
 			console.log();
 			console.log(`Minifying ${devFilePath}...`);

diff --git a/src/_.contribution.ts b/src/_.contribution.ts
@@ -20,9 +20,7 @@ const lazyLanguageLoaders: { [languageId: string]: LazyLanguageLoader } = {};
 class LazyLanguageLoader {
 	public static getOrCreate(languageId: string): LazyLanguageLoader {
 		if (!lazyLanguageLoaders[languageId]) {
-			lazyLanguageLoaders[languageId] = new LazyLanguageLoader(
-				languageId
-			);
+			lazyLanguageLoaders[languageId] = new LazyLanguageLoader(languageId);
 		}
 		return lazyLanguageLoaders[languageId];
 	}

diff --git a/src/abap/abap.ts b/src/abap/abap.ts
@@ -499,17 +499,11 @@ export const language = <languages.IMonarchLanguage>{
 			[/[:,.]/, 'delimiter'],
 
 			[/[{}()\[\]]/, '@brackets'],
-			[
-				/@symbols/,
-				{ cases: { '@operators': 'operator', '@default': '' } }
-			],
+			[/@symbols/, { cases: { '@operators': 'operator', '@default': '' } }],
 
 			[/'/, { token: 'string', bracket: '@open', next: '@stringquote' }],
 			[/`/, { token: 'string', bracket: '@open', next: '@stringping' }],
-			[
-				/\|/,
-				{ token: 'string', bracket: '@open', next: '@stringtemplate' }
-			],
+			[/\|/, { token: 'string', bracket: '@open', next: '@stringtemplate' }],
 
 			[/\d+/, 'number']
 		],

diff --git a/src/apex/apex.test.ts b/src/apex/apex.test.ts
@@ -233,8 +233,7 @@ testTokenization('apex', [
 	// Keywords
 	[
 		{
-			line:
-				'package test; class Program { static void main(String[] args) {} } }',
+			line: 'package test; class Program { static void main(String[] args) {} } }',
 			tokens: [
 				{ startIndex: 0, type: 'keyword.package.apex' },
 				{ startIndex: 7, type: '' },
@@ -271,8 +270,7 @@ testTokenization('apex', [
 	// Keywords with case variations
 	[
 		{
-			line:
-				'Package test; CLASS Program { Static void main(String[] args) {} } }',
+			line: 'Package test; CLASS Program { Static void main(String[] args) {} } }',
 			tokens: [
 				{ startIndex: 0, type: 'keyword.Package.apex' },
 				{ startIndex: 7, type: '' },

diff --git a/src/apex/apex.ts b/src/apex/apex.ts
@@ -34,12 +34,8 @@ export const conf: languages.LanguageConfiguration = {
 	],
 	folding: {
 		markers: {
-			start: new RegExp(
-				'^\\s*//\\s*(?:(?:#?region\\b)|(?:<editor-fold\\b))'
-			),
-			end: new RegExp(
-				'^\\s*//\\s*(?:(?:#?endregion\\b)|(?:</editor-fold>))'
-			)
+			start: new RegExp('^\\s*//\\s*(?:(?:#?region\\b)|(?:<editor-fold\\b))'),
+			end: new RegExp('^\\s*//\\s*(?:(?:#?endregion\\b)|(?:</editor-fold>))')
 		}
 	}
 };
@@ -300,10 +296,7 @@ export const language = <languages.IMonarchLanguage>{
 
 			// numbers
 			[/(@digits)[eE]([\-+]?(@digits))?[fFdD]?/, 'number.float'],
-			[
-				/(@digits)\.(@digits)([eE][\-+]?(@digits))?[fFdD]?/,
-				'number.float'
-			],
+			[/(@digits)\.(@digits)([eE][\-+]?(@digits))?[fFdD]?/, 'number.float'],
 			[/(@digits)[fFdD]/, 'number.float'],
 			[/(@digits)[lL]?/, 'number'],
 

diff --git a/src/azcli/azcli.test.ts b/src/azcli/azcli.test.ts
@@ -3,15 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import {
-	testTokenization as actualTestTokenization,
-	ITestItem
-} from '../test/testRunner';
+import { testTokenization as actualTestTokenization, ITestItem } from '../test/testRunner';
 
-function testTokenization(
-	_language: string | string[],
-	tests: ITestItem[][]
-): void {
+function testTokenization(_language: string | string[], tests: ITestItem[][]): void {
 	tests = tests.map((t) => {
 		return t.map((t) => {
 			return {
@@ -93,8 +87,7 @@ testTokenization('azcli', [
 	],
 	[
 		{
-			line:
-				'az ad sp create-for-rb  --name ServicePrincipalName --password PASSWORD',
+			line: 'az ad sp create-for-rb  --name ServicePrincipalName --password PASSWORD',
 			tokens: [
 				{ startIndex: 0, type: 'keyword.azcli' },
 				{ startIndex: 23, type: 'key.identifier.azcli' },

diff --git a/src/bat/bat.ts b/src/bat/bat.ts
@@ -55,10 +55,7 @@ export const language = <languages.IMonarchLanguage>{
 		root: [
 			[/^(\s*)(rem(?:\s.*|))$/, ['', 'comment']],
 
-			[
-				/(\@?)(@keywords)(?!\w)/,
-				[{ token: 'keyword' }, { token: 'keyword.$2' }]
-			],
+			[/(\@?)(@keywords)(?!\w)/, [{ token: 'keyword' }, { token: 'keyword.$2' }]],
 
 			// whitespace
 			[/[ \t\r\n]+/, ''],

diff --git a/src/clojure/clojure.test.ts b/src/clojure/clojure.test.ts
@@ -864,10 +864,7 @@ testTokenization('clojure', [
 	],
 
 	// comments
-	createTestCases(
-		['; this is an in-line comment.', ';; this is a line comment.'],
-		'comment'
-	),
+	createTestCases(['; this is an in-line comment.', ';; this is a line comment.'], 'comment'),
 
 	// `comment`
 	[

diff --git a/src/coffee/coffee.test.ts b/src/coffee/coffee.test.ts
@@ -1694,8 +1694,7 @@ testTokenization('coffeescript', [
 			tokens: [{ startIndex: 0, type: '' }]
 		},
 		{
-			line:
-				'# Everything is an Expression (at least, as much as possible)',
+			line: '# Everything is an Expression (at least, as much as possible)',
 			tokens: [{ startIndex: 0, type: 'comment.coffee' }]
 		},
 		{

diff --git a/src/cpp/cpp.ts b/src/cpp/cpp.ts
@@ -281,10 +281,7 @@ export const language = <languages.IMonarchLanguage>{
 	tokenizer: {
 		root: [
 			// C++ 11 Raw String
-			[
-				/@encoding?R\"(?:([^ ()\\\t]*))\(/,
-				{ token: 'string.raw.begin', next: '@raw.$1' }
-			],
+			[/@encoding?R\"(?:([^ ()\\\t]*))\(/, { token: 'string.raw.begin', next: '@raw.$1' }],
 
 			// identifiers and keywords
 			[
@@ -303,10 +300,7 @@ export const language = <languages.IMonarchLanguage>{
 			// [[ attributes ]].
 			[/\[\[.*\]\]/, 'annotation'],
 
-			[
-				/^\s*#include/,
-				{ token: 'keyword.directive.include', next: '@include' }
-			],
+			[/^\s*#include/, { token: 'keyword.directive.include', next: '@include' }],
 
 			// Preprocessor directive
 			[/^\s*#\s*\w+/, 'keyword'],
@@ -383,12 +377,7 @@ export const language = <languages.IMonarchLanguage>{
 							'string.raw.end',
 							{ token: 'string.raw.end', next: '@pop' }
 						],
-						'@default': [
-							'string.raw',
-							'string.raw',
-							'string.raw',
-							'string.raw'
-						]
+						'@default': ['string.raw', 'string.raw', 'string.raw', 'string.raw']
 					}
 				}
 			],

diff --git a/src/csharp/csharp.test.ts b/src/csharp/csharp.test.ts
@@ -205,8 +205,7 @@ testTokenization('csharp', [
 			tokens: [{ startIndex: 0, type: '' }]
 		},
 		{
-			line:
-				'			string someString = $"hello{outside+variable}the string again {{ escaped";',
+			line: '			string someString = $"hello{outside+variable}the string again {{ escaped";',
 			tokens: [
 				{ startIndex: 0, type: '' },
 				{ startIndex: 3, type: 'keyword.string.cs' },
@@ -425,8 +424,7 @@ testTokenization('csharp', [
 	// Keywords
 	[
 		{
-			line:
-				'namespace VS { class Program { static void Main(string[] args) {} } }',
+			line: 'namespace VS { class Program { static void Main(string[] args) {} } }',
 			tokens: [
 				{ startIndex: 0, type: 'keyword.namespace.cs' },
 				{ startIndex: 9, type: '' },

diff --git a/src/csharp/csharp.ts b/src/csharp/csharp.ts
@@ -163,16 +163,7 @@ export const language = <languages.IMonarchLanguage>{
 
 	namespaceFollows: ['namespace', 'using'],
 
-	parenFollows: [
-		'if',
-		'for',
-		'while',
-		'switch',
-		'foreach',
-		'using',
-		'catch',
-		'when'
-	],
+	parenFollows: ['if', 'for', 'while', 'switch', 'foreach', 'using', 'catch', 'when'],
 
 	operators: [
 		'=',

diff --git a/src/css/css.ts b/src/css/css.ts
@@ -69,23 +69,14 @@ export const language = <languages.IMonarchLanguage>{
 				{ token: 'keyword', next: '@keyframedeclaration' }
 			],
 			['[@](page|content|font-face|-moz-document)', { token: 'keyword' }],
-			[
-				'[@](charset|namespace)',
-				{ token: 'keyword', next: '@declarationbody' }
-			],
+			['[@](charset|namespace)', { token: 'keyword', next: '@declarationbody' }],
 			[
 				'(url-prefix)(\\()',
-				[
-					'attribute.value',
-					{ token: 'delimiter.parenthesis', next: '@urldeclaration' }
-				]
+				['attribute.value', { token: 'delimiter.parenthesis', next: '@urldeclaration' }]
 			],
 			[
 				'(url)(\\()',
-				[
-					'attribute.value',
-					{ token: 'delimiter.parenthesis', next: '@urldeclaration' }
-				]
+				['attribute.value', { token: 'delimiter.parenthesis', next: '@urldeclaration' }]
 			],
 			{ include: '@selectorname' },
 			['[\\*]', 'tag'], // selector symbols
@@ -96,11 +87,7 @@ export const language = <languages.IMonarchLanguage>{
 
 		selectorbody: [
 			{ include: '@comments' },
-			[
-				'[*_]?@identifier@ws:(?=(\\s|\\d|[^{;}]*[;}]))',
-				'attribute.name',
-				'@rulevalue'
-			], // rule definition: to distinguish from a nested selector check for whitespace, number or a semicolon
+			['[*_]?@identifier@ws:(?=(\\s|\\d|[^{;}]*[;}]))', 'attribute.name', '@rulevalue'], // rule definition: to distinguish from a nested selector check for whitespace, number or a semicolon
 			['}', { token: 'delimiter.bracket', next: '@pop' }]
 		],
 
@@ -117,17 +104,11 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@comments' },
 			[
 				'(url-prefix)(\\()',
-				[
-					'attribute.value',
-					{ token: 'delimiter.parenthesis', next: '@urldeclaration' }
-				]
+				['attribute.value', { token: 'delimiter.parenthesis', next: '@urldeclaration' }]
 			],
 			[
 				'(url)(\\()',
-				[
-					'attribute.value',
-					{ token: 'delimiter.parenthesis', next: '@urldeclaration' }
-				]
+				['attribute.value', { token: 'delimiter.parenthesis', next: '@urldeclaration' }]
 			],
 			{ include: '@functioninvocation' },
 			{ include: '@numbers' },
@@ -145,13 +126,9 @@ export const language = <languages.IMonarchLanguage>{
 			['(?=})', { token: '', next: '@pop' }] // missing semicolon
 		],
 
-		warndebug: [
-			['[@](warn|debug)', { token: 'keyword', next: '@declarationbody' }]
-		],
+		warndebug: [['[@](warn|debug)', { token: 'keyword', next: '@declarationbody' }]],
 
-		import: [
-			['[@](import)', { token: 'keyword', next: '@declarationbody' }]
-		],
+		import: [['[@](import)', { token: 'keyword', next: '@declarationbody' }]],
 
 		urldeclaration: [
 			{ include: '@strings' },
@@ -211,10 +188,7 @@ export const language = <languages.IMonarchLanguage>{
 		],
 
 		functioninvocation: [
-			[
-				'@identifier\\(',
-				{ token: 'attribute.value', next: '@functionarguments' }
-			]
+			['@identifier\\(', { token: 'attribute.value', next: '@functionarguments' }]
 		],
 
 		functionarguments: [

diff --git a/src/dart/dart.ts b/src/dart/dart.ts
@@ -255,34 +255,21 @@ export const language = <languages.IMonarchLanguage>{
 		regexp: [
 			[
 				/(\{)(\d+(?:,\d*)?)(\})/,
-				[
-					'regexp.escape.control',
-					'regexp.escape.control',
-					'regexp.escape.control'
-				]
+				['regexp.escape.control', 'regexp.escape.control', 'regexp.escape.control']
 			],
 			[
 				/(\[)(\^?)(?=(?:[^\]\\\/]|\\.)+)/,
-				[
-					'regexp.escape.control',
-					{ token: 'regexp.escape.control', next: '@regexrange' }
-				]
-			],
-			[
-				/(\()(\?:|\?=|\?!)/,
-				['regexp.escape.control', 'regexp.escape.control']
+				['regexp.escape.control', { token: 'regexp.escape.control', next: '@regexrange' }]
 			],
+			[/(\()(\?:|\?=|\?!)/, ['regexp.escape.control', 'regexp.escape.control']],
 			[/[()]/, 'regexp.escape.control'],
 			[/@regexpctl/, 'regexp.escape.control'],
 			[/[^\\\/]/, 'regexp'],
 			[/@regexpesc/, 'regexp.escape'],
 			[/\\\./, 'regexp.invalid'],
 			[
 				/(\/)([gimsuy]*)/,
-				[
-					{ token: 'regexp', bracket: '@close', next: '@pop' },
-					'keyword.other'
-				]
+				[{ token: 'regexp', bracket: '@close', next: '@pop' }, 'keyword.other']
 			]
 		],
 

diff --git a/src/dockerfile/dockerfile.test.ts b/src/dockerfile/dockerfile.test.ts
@@ -146,8 +146,7 @@ testTokenization('dockerfile', [
 			]
 		},
 		{
-			line:
-				'    && sh autogen.sh && ./configure && make && make install \\',
+			line: '    && sh autogen.sh && ./configure && make && make install \\',
 			tokens: [{ startIndex: 0, type: '' }]
 		},
 		{