Skip to content

Commit 84fcc9e

Browse files
committed
enable Apex; prepare 1.4.0 release
1 parent fe35e00 commit 84fcc9e

File tree

3 files changed

+26
-5
lines changed

3 files changed

+26
-5
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
33

44
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
55

6+
## [1.4.0] - 2017-04-20
7+
### Added
8+
- Output console shows syntax errors in `.clang-format` files
9+
- Extension works on Apex now
10+
611
## [1.3.0] - 2017-04-20
712
### Added
813
- ```-assume-filename=``` option configurable as ```clang-format.assumeFilename``` in user/workspace settings

package.json

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
"name": "clang-format",
33
"displayName": "Clang-Format",
44
"description": "Use Clang-Format in Visual Studio Code",
5-
"version": "1.3.0",
5+
"version": "1.4.0",
66
"publisher": "xaver",
77
"engines": {
88
"vscode": "^1.0.0"
99
},
1010
"galleryBanner": {
11-
"color": "#4183c4",
11+
"color": "#005577",
1212
"theme": "dark"
1313
},
1414
"dependencies": {
@@ -33,7 +33,8 @@
3333
"onLanguage:java",
3434
"onLanguage:javascript",
3535
"onLanguage:typescript",
36-
"onLanguage:proto"
36+
"onLanguage:proto",
37+
"onLanguage:apex"
3738
],
3839
"contributes": {
3940
"configuration": {
@@ -175,6 +176,21 @@
175176
"default": "",
176177
"description": "clang-format fallback style for Protobuf, left empty to use clang-format.fallbackStyle"
177178
},
179+
"clang-format.language.apex.enable": {
180+
"type": "boolean",
181+
"default": true,
182+
"description": "enable formatting for Apex (requires reloading Visual Studio Code)"
183+
},
184+
"clang-format.language.apex.style": {
185+
"type": "string",
186+
"default": "",
187+
"description": "clang-format fallback style for Apex, left empty to use clang-format.style"
188+
},
189+
"clang-format.language.apex.fallbackStyle": {
190+
"type": "string",
191+
"default": "",
192+
"description": "clang-format fallback style for Apex, left empty to use clang-format.fallbackStyle"
193+
},
178194
"clang-format.assumeFilename": {
179195
"type": "string",
180196
"default": "",
@@ -200,4 +216,4 @@
200216
"url": "https://github.com/xaverh/vscode-clang-format-provider"
201217
},
202218
"license": "MIT"
203-
}
219+
}

src/clangMode.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import vscode = require('vscode');
44

55
let languages: string[] = [];
6-
for (let l of ['cpp', 'c', 'objective-c', 'objective-cpp', 'java', 'javascript', 'typescript', 'proto']) {
6+
for (let l of ['cpp', 'c', 'objective-c', 'objective-cpp', 'java', 'javascript', 'typescript', 'proto', 'apex']) {
77
if (vscode.workspace.getConfiguration('clang-format').get('language.' + l + '.enable')) {
88
languages.push(l);
99
}

0 commit comments

Comments
 (0)