Skip to content

Commit 429b70e

Browse files
repositonyrepositony
committed
Macrobody code snippet updates and version updates
1 parent 58fec83 commit 429b70e

File tree

4 files changed

+28
-24
lines changed

4 files changed

+28
-24
lines changed

‎CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@ All notable changes to the extension will be documented in this file.
44

55
For full commit history and versions please see the [repository](https://github.com/repositony/vscode_mcnp).
66

7+
## Version 1.0.4
8+
9+
- Fixed missing UKAEA-CuV syntax highlighting
10+
- Capitalised macrobody code snippet keywords
11+
712
## Version 1.0.3
813

914
- Added macrobody code snippets
10-
- Fixed missing UKAEA-CuV syntax highlighting
1115
- Fixed numbered geometry cardname captures
1216

1317
## Version 1.0.2

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vscodemcnp",
3-
"version": "1.0.3",
3+
"version": "1.0.4",
44
"displayName": "MCNP6 syntax highlighting and snippets",
55
"publisher": "repositony",
66
"author": {

‎snippets/mcnp.tmSnippets.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,7 @@
933933
"BOX"
934934
],
935935
"body": [
936-
"box $ Macrobody: Arbitrarily Oriented Orthogonal Box",
936+
"BOX $ Macrobody: Arbitrarily Oriented Orthogonal Box",
937937
" ${1:x} ${2:y} ${3:z} $ (x,y,z) coordinates of a corner of the box",
938938
" ${4:a1x} ${5:a1y} ${6:a1z} $ Vector of first side from the specified corner",
939939
" ${7:a2x} ${8:a2y} ${9:a2z} $ Vector of second side from the specified corner",
@@ -947,7 +947,7 @@
947947
"RPP"
948948
],
949949
"body": [
950-
"rpp $ Macrobody: Rectangular Parallelepiped",
950+
"RPP $ Macrobody: Rectangular Parallelepiped",
951951
" ${1:xmin} ${2:xmax} $ Termini of box sides normal to the x axis",
952952
" ${3:ymin} ${4:ymax} $ Termini of box sides normal to the y axis",
953953
" ${5:zmin} ${6:zmax} $ Termini of box sides normal to the z axis"
@@ -960,7 +960,7 @@
960960
"SPH"
961961
],
962962
"body": [
963-
"sph $ Macrobody: Sphere",
963+
"SPH $ Macrobody: Sphere",
964964
" ${1:x} ${2:y} ${3:z} $ (x,y,z) coordinates of the center of the sphere",
965965
" ${4:r} $ Radius of sphere"
966966
],
@@ -972,7 +972,7 @@
972972
"RCC"
973973
],
974974
"body": [
975-
"rcc $ Macrobody: Right Circular Cylinder",
975+
"RCC $ Macrobody: Right Circular Cylinder",
976976
" ${1:x} ${2:y} ${3:z} $ (x,y,z) coordinates of the center of the cylinder base",
977977
" ${4:h1} ${5:h2} ${6:h3} $ Axis vector for orientation and cylinder height",
978978
" ${7:r} $ Radius of cylinder"
@@ -985,7 +985,7 @@
985985
"HEX"
986986
],
987987
"body": [
988-
"hex $ Macrobody: Right Hexagonal Prism",
988+
"HEX $ Macrobody: Right Hexagonal Prism",
989989
" ${1:x} ${2:y} ${3:z} $ (x,y,z) coordinates at the bottom center of the hexagonal prism",
990990
" ${4:h1} ${5:h2} ${6:h3} $ Vector from the bottom to top of hexagonal prism",
991991
" ${7:r1} ${8:r2} ${9:r3} $ Vector from the axis to the center of the first facet",
@@ -1000,7 +1000,7 @@
10001000
"RHP"
10011001
],
10021002
"body": [
1003-
"rhp $ Macrobody: Right Hexagonal Prism",
1003+
"RHP $ Macrobody: Right Hexagonal Prism",
10041004
" ${1:x} ${2:y} ${3:z} $ (x,y,z) coordinates at the bottom center of the hexagonal prism",
10051005
" ${4:h1} ${5:h2} ${6:h3} $ Vector from the bottom to top of hexagonal prism",
10061006
" ${7:r1} ${8:r2} ${9:r3} $ Vector from the axis to the center of the first facet",
@@ -1015,7 +1015,7 @@
10151015
"REC"
10161016
],
10171017
"body": [
1018-
"rec $ Macrobody: Right Elliptical Cylinder",
1018+
"REC $ Macrobody: Right Elliptical Cylinder",
10191019
" ${1:x} ${2:y} ${3:z} $ (x,y,z) coordinates of the cylinder bottom",
10201020
" ${4:h1} ${5:h2} ${6:h3} $ Cylinder axis height vector",
10211021
" ${7:v1x} ${8:v1y} ${9:v1z} $ Ellipse minor axis vector, normal to (h1,h2,h3)",
@@ -1029,7 +1029,7 @@
10291029
"TRC"
10301030
],
10311031
"body": [
1032-
"trc $ Macrobody: Truncated Right-angle Cone",
1032+
"TRC $ Macrobody: Truncated Right-angle Cone",
10331033
" ${1:x} ${2:y} ${3:z} $ (x,y,z) coordinates of the cone bottom",
10341034
" ${4:h1} ${5:h2} ${6:h3} $ Cone axis height vector",
10351035
" ${7:r1} $ Radius of lower cone base",
@@ -1043,7 +1043,7 @@
10431043
"ELL"
10441044
],
10451045
"body": [
1046-
"ell $ Macrobody: Ellipsoid",
1046+
"ELL $ Macrobody: Ellipsoid",
10471047
" ${1:v1x} ${2:v1y} ${3:v1z} $ Coordinates of first focus (r>0) or ellipsoid center (r<0)",
10481048
" ${4:v2x} ${5:v2y} ${6:v2z} $ Coordinates of second focus (r>0) or major axis vector (r<0)",
10491049
" ${7:r} $ major (r>0) or minor (r<0) radius length"
@@ -1056,7 +1056,7 @@
10561056
"WED"
10571057
],
10581058
"body": [
1059-
"wed $ Macrobody: Wedge",
1059+
"WED $ Macrobody: Wedge",
10601060
" ${1:x} ${2:y} ${3:z} $ (x,y,z) coordinates of wedge vertex",
10611061
" ${4:v1x} ${5:v1y} ${6:v1z} $ Vector of first side of triangular base",
10621062
" ${7:v2x} ${8:v2y} ${9:v2z} $ Vector of second side of triangular base",
@@ -1071,7 +1071,7 @@
10711071
"ARB"
10721072
],
10731073
"body": [
1074-
"arb $ Macrobody: Arbitrary Polyhedron",
1074+
"ARB $ Macrobody: Arbitrary Polyhedron",
10751075
" x1 y2 z3 $ (x,y,z) coordinates of first corner of the polyhedron",
10761076
" x1 y2 z3 $ (x,y,z) coordinates of second corner of the polyhedron",
10771077
" x1 y2 z3 $ (x,y,z) coordinates of third corner of the polyhedron",

‎snippets/mcnp.tmSnippets.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ Box macrobody:
830830
prefix:
831831
- BOX
832832
body:
833-
- "box $ Macrobody: Arbitrarily Oriented Orthogonal Box"
833+
- "BOX $ Macrobody: Arbitrarily Oriented Orthogonal Box"
834834
- " ${1:x} ${2:y} ${3:z} $ (x,y,z) coordinates of a corner of the box"
835835
- " ${4:a1x} ${5:a1y} ${6:a1z} $ Vector of first side from the specified corner"
836836
- " ${7:a2x} ${8:a2y} ${9:a2z} $ Vector of second side from the specified corner"
@@ -842,7 +842,7 @@ RPP macrobody:
842842
prefix:
843843
- RPP
844844
body:
845-
- "rpp $ Macrobody: Rectangular Parallelepiped"
845+
- "RPP $ Macrobody: Rectangular Parallelepiped"
846846
- " ${1:xmin} ${2:xmax} $ Termini of box sides normal to the x axis"
847847
- " ${3:ymin} ${4:ymax} $ Termini of box sides normal to the y axis"
848848
- " ${5:zmin} ${6:zmax} $ Termini of box sides normal to the z axis"
@@ -853,7 +853,7 @@ SPH macrobody:
853853
prefix:
854854
- SPH
855855
body:
856-
- "sph $ Macrobody: Sphere"
856+
- "SPH $ Macrobody: Sphere"
857857
- " ${1:x} ${2:y} ${3:z} $ (x,y,z) coordinates of the center of the sphere"
858858
- " ${4:r} $ Radius of sphere"
859859
description: SPH macrobody
@@ -863,7 +863,7 @@ RCC macrobody:
863863
prefix:
864864
- RCC
865865
body:
866-
- "rcc $ Macrobody: Right Circular Cylinder"
866+
- "RCC $ Macrobody: Right Circular Cylinder"
867867
- " ${1:x} ${2:y} ${3:z} $ (x,y,z) coordinates of the center of the cylinder base"
868868
- " ${4:h1} ${5:h2} ${6:h3} $ Axis vector for orientation and cylinder height"
869869
- " ${7:r} $ Radius of cylinder"
@@ -874,7 +874,7 @@ HEX macrobody:
874874
prefix:
875875
- HEX
876876
body:
877-
- "hex $ Macrobody: Right Hexagonal Prism"
877+
- "HEX $ Macrobody: Right Hexagonal Prism"
878878
- " ${1:x} ${2:y} ${3:z} $ (x,y,z) coordinates at the bottom center of the hexagonal prism"
879879
- " ${4:h1} ${5:h2} ${6:h3} $ Vector from the bottom to top of hexagonal prism"
880880
- " ${7:r1} ${8:r2} ${9:r3} $ Vector from the axis to the center of the first facet"
@@ -887,7 +887,7 @@ RHP macrobody:
887887
prefix:
888888
- RHP
889889
body:
890-
- "rhp $ Macrobody: Right Hexagonal Prism"
890+
- "RHP $ Macrobody: Right Hexagonal Prism"
891891
- " ${1:x} ${2:y} ${3:z} $ (x,y,z) coordinates at the bottom center of the hexagonal prism"
892892
- " ${4:h1} ${5:h2} ${6:h3} $ Vector from the bottom to top of hexagonal prism"
893893
- " ${7:r1} ${8:r2} ${9:r3} $ Vector from the axis to the center of the first facet"
@@ -900,7 +900,7 @@ REC macrobody:
900900
prefix:
901901
- REC
902902
body:
903-
- "rec $ Macrobody: Right Elliptical Cylinder"
903+
- "REC $ Macrobody: Right Elliptical Cylinder"
904904
- " ${1:x} ${2:y} ${3:z} $ (x,y,z) coordinates of the cylinder bottom"
905905
- " ${4:h1} ${5:h2} ${6:h3} $ Cylinder axis height vector"
906906
- " ${7:v1x} ${8:v1y} ${9:v1z} $ Ellipse minor axis vector, normal to (h1,h2,h3)"
@@ -912,7 +912,7 @@ TRC macrobody:
912912
prefix:
913913
- TRC
914914
body:
915-
- "trc $ Macrobody: Truncated Right-angle Cone"
915+
- "TRC $ Macrobody: Truncated Right-angle Cone"
916916
- " ${1:x} ${2:y} ${3:z} $ (x,y,z) coordinates of the cone bottom"
917917
- " ${4:h1} ${5:h2} ${6:h3} $ Cone axis height vector"
918918
- " ${7:r1} $ Radius of lower cone base"
@@ -924,7 +924,7 @@ ELL macrobody:
924924
prefix:
925925
- ELL
926926
body:
927-
- "ell $ Macrobody: Ellipsoid"
927+
- "ELL $ Macrobody: Ellipsoid"
928928
- " ${1:v1x} ${2:v1y} ${3:v1z} $ Coordinates of first focus (r>0) or ellipsoid center (r<0)"
929929
- " ${4:v2x} ${5:v2y} ${6:v2z} $ Coordinates of second focus (r>0) or major axis vector (r<0)"
930930
- " ${7:r} $ major (r>0) or minor (r<0) radius length"
@@ -935,7 +935,7 @@ WED macrobody:
935935
prefix:
936936
- WED
937937
body:
938-
- "wed $ Macrobody: Wedge"
938+
- "WED $ Macrobody: Wedge"
939939
- " ${1:x} ${2:y} ${3:z} $ (x,y,z) coordinates of wedge vertex"
940940
- " ${4:v1x} ${5:v1y} ${6:v1z} $ Vector of first side of triangular base"
941941
- " ${7:v2x} ${8:v2y} ${9:v2z} $ Vector of second side of triangular base"
@@ -949,7 +949,7 @@ ARB macrobody:
949949
prefix:
950950
- ARB
951951
body:
952-
- "arb $ Macrobody: Arbitrary Polyhedron"
952+
- "ARB $ Macrobody: Arbitrary Polyhedron"
953953
- " x1 y2 z3 $ (x,y,z) coordinates of first corner of the polyhedron"
954954
- " x1 y2 z3 $ (x,y,z) coordinates of second corner of the polyhedron"
955955
- " x1 y2 z3 $ (x,y,z) coordinates of third corner of the polyhedron"

0 commit comments

Comments
 (0)