Skip to content

Commit

Permalink
Merge pull request #19 from krvajal/feat/indentation-rules
Browse files Browse the repository at this point in the history
+ add indentation rules
  • Loading branch information
krvajal authored Jan 1, 2018
2 parents 13b09c9 + e66f7c7 commit d817aad
Show file tree
Hide file tree
Showing 4 changed files with 212 additions and 173 deletions.
60 changes: 42 additions & 18 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,44 +1,68 @@
# Change Log

All notable changes to this extension will be documented in this file.

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

## [Unreleased]
- Initial release

## [0.4.0] - 2017-05-29
### Added
- Show docs for intrinsic functions on hover
### Changed
- Updated icon for the extension
- Fix bug on linter not working
* Initial release

## [0.4.0] - 2017-05-29

### Added

* Show docs for intrinsic functions on hover
### Changed
* Updated icon for the extension
* Fix bug on linter not working

## [0.4.4] - 2017-07-03
### Added
- Add support for old fortran languague
### Fixed
- Fix bug #1

### Added

* Add support for old fortran languague
### Fixed
* Fix bug #1

## [0.4.5] - 2017-07-04

### Fixed
- Fix intrinsic functions docs not loading

* Fix intrinsic functions docs not loading

## [0.4.6] - 2017-07-04

### Added
- Add support for user configuration settings

* Add support for user configuration settings

## [0.5.0] - 2017-07-06

### Added
- Add code autocompletion for intrinsic and in document declared functions

* Add code autocompletion for intrinsic and in document declared functions

## [0.5.1] - 2017-07-06

### Added
- Add `Go -> Go to symbol in file` command support for functions

* Add `Go -> Go to symbol in file` command support for functions

## [0.5.2] - 2017-07-14
### Fixed
- A bug in the regex to parse output errors from gfortran
- Now the spawn command uses the directory of the file `gfortran` is analyzing

### Fixed

* A bug in the regex to parse output errors from gfortran
* Now the spawn command uses the directory of the file `gfortran` is analyzing

## [0.6.2] - 2018-01-01

### Added

* Autoindentation rules for code blocks (thx @graceyangfan for the feature request)

### Fixed

* Fixed some highlighting issues by @pedro-ricardo
72 changes: 53 additions & 19 deletions language-configuration.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,55 @@
{
"comments": {
"lineComment": "!"
},
"brackets": [
["[", "]"],
["(", ")"],
["(/", "/)"]
],
"autoClosingPairs": [
{ "open": "[", "close": "]" },
{ "open": "(", "close": ")" },
{ "open": "(/", "close": "/)" }
],
"surroundingPairs": [
["[", "]"],
["(", ")"],
["'", "'"],
["\"", "\""]
]
"comments": {
"lineComment": "!"
},
"brackets": [
[
"[",
"]"
],
[
"(",
")"
],
[
"(/",
"/)"
]
],
"autoClosingPairs": [
{
"open": "[",
"close": "]"
},
{
"open": "(",
"close": ")"
},
{
"open": "(/",
"close": "/)"
}
],
"surroundingPairs": [
[
"[",
"]"
],
[
"(",
")"
],
[
"'",
"'"
],
[
"\"",
"\""
]
],
"indentationRules": {
"increaseIndentPattern": "^[^!]*(then\\s*(!.*)?$|\\s*(program|subroutine|function|module|do|block|associate)\\b.*|\\s*(else|else\\s*if|elsewhere)\\b.*)$",
"decreaseIndentPattern": "^\\s*end\\s*(if|do)\\s*|^\\s*else\\b.*$|^\\s*end\\s(function|subroutine|module|program)"
}
}
Loading

0 comments on commit d817aad

Please sign in to comment.