Skip to content

Commit 352d641

Browse files
xiaoxiangmoemjbvz
xiaoxiangmoe
authored and
mjbvz
committed
Add .cjs to known JavaScript file extensions (microsoft#85460)
1 parent d4ab1fc commit 352d641

7 files changed

Lines changed: 16 additions & 8 deletions

File tree

‎build/lib/electron.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export const config = {
5959
darwinBundleDocumentType(["asp", "aspx", "cshtml", "htm", "html", "jshtm", "jsp", "phtml", "shtml"], 'resources/darwin/html.icns'),
6060
darwinBundleDocumentType(["jade"], 'resources/darwin/jade.icns'),
6161
darwinBundleDocumentType(["jav", "java"], 'resources/darwin/java.icns'),
62-
darwinBundleDocumentType(["js", "jscsrc", "jshintrc", "mjs"], 'resources/darwin/javascript.icns'),
62+
darwinBundleDocumentType(["js", "jscsrc", "jshintrc", "mjs", "cjs"], 'resources/darwin/javascript.icns'),
6363
darwinBundleDocumentType(["json"], 'resources/darwin/json.icns'),
6464
darwinBundleDocumentType(["less"], 'resources/darwin/less.icns'),
6565
darwinBundleDocumentType(["markdown", "md", "mdoc", "mdown", "mdtext", "mdtxt", "mdwn", "mkd", "mkdn"], 'resources/darwin/markdown.icns'),

‎build/win32/code.iss‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,13 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cc";
182182
Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\cpp.ico"; Tasks: associatewithfiles
183183
Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
184184

185+
Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cjs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
186+
Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cjs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cjs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
187+
Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cjs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JavaScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
188+
Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cjs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
189+
Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cjs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\javascript.ico"; Tasks: associatewithfiles
190+
Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cjs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
191+
185192
Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.clj\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
186193
Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.clj\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.clj"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
187194
Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clj"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Clojure}"; Flags: uninsdeletekey; Tasks: associatewithfiles

‎extensions/javascript/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
".js",
3333
".es6",
3434
".mjs",
35+
".cjs",
3536
".pac"
3637
],
3738
"filenames": [

‎extensions/markdown-basics/syntaxes/markdown.tmLanguage.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,7 @@
957957
]
958958
},
959959
"fenced_code_block_js": {
960-
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(js|jsx|javascript|es6|mjs|\\{\\.js.+?\\})((\\s+|:|\\{)[^`~]*)?$)",
960+
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(js|jsx|javascript|es6|mjs|cjs|\\{\\.js.+?\\})((\\s+|:|\\{)[^`~]*)?$)",
961961
"name": "markup.fenced_code.block.markdown",
962962
"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
963963
"beginCaptures": {
@@ -2623,4 +2623,4 @@
26232623
"name": "markup.inline.raw.string.markdown"
26242624
}
26252625
}
2626-
}
2626+
}

‎extensions/typescript-basics/build/update-grammars.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function patchGrammar(grammar) {
3333

3434
function adaptToJavaScript(grammar, replacementScope) {
3535
grammar.name = 'JavaScript (with React support)';
36-
grammar.fileTypes = ['.js', '.jsx', '.es6', '.mjs'];
36+
grammar.fileTypes = ['.js', '.jsx', '.es6', '.mjs', '.cjs'];
3737
grammar.scopeName = `source${replacementScope}`;
3838

3939
var fixScopeNames = function (rule) {

‎src/vs/base/test/node/glob.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ suite('Glob', () => {
1414
// let patterns = [
1515
// '{**/*.cs,**/*.json,**/*.csproj,**/*.sln}',
1616
// '{**/*.cs,**/*.csproj,**/*.sln}',
17-
// '{**/*.ts,**/*.tsx,**/*.js,**/*.jsx,**/*.es6,**/*.mjs}',
17+
// '{**/*.ts,**/*.tsx,**/*.js,**/*.jsx,**/*.es6,**/*.mjs,**/*.cjs}',
1818
// '**/*.go',
1919
// '{**/*.ps,**/*.ps1}',
2020
// '{**/*.c,**/*.cpp,**/*.h}',
2121
// '{**/*.fsx,**/*.fsi,**/*.fs,**/*.ml,**/*.mli}',
22-
// '{**/*.js,**/*.jsx,**/*.es6,**/*.mjs}',
22+
// '{**/*.js,**/*.jsx,**/*.es6,**/*.mjs,**/*.cjs}',
2323
// '{**/*.ts,**/*.tsx}',
2424
// '{**/*.php}',
2525
// '{**/*.php}',
@@ -1015,4 +1015,4 @@ suite('Glob', () => {
10151015
assertNoGlobMatch(p, '/DNXConsoleApp/foo/Program.cs');
10161016
}
10171017
});
1018-
});
1018+
});

‎src/vs/workbench/contrib/extensions/test/electron-browser/extensionsTipsService.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ suite('ExtensionsTipsService Test', () => {
206206
...{
207207
extensionTips: {
208208
'ms-vscode.csharp': '{**/*.cs,**/project.json,**/global.json,**/*.csproj,**/*.sln,**/appsettings.json}',
209-
'msjsdiag.debugger-for-chrome': '{**/*.ts,**/*.tsx**/*.js,**/*.jsx,**/*.es6,**/.babelrc}',
209+
'msjsdiag.debugger-for-chrome': '{**/*.ts,**/*.tsx,**/*.js,**/*.jsx,**/*.es6,**/*.mjs,**/*.cjs,**/.babelrc}',
210210
'lukehoban.Go': '**/*.go'
211211
},
212212
extensionImportantTips: {

0 commit comments

Comments
 (0)