Skip to content

Font tidy #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 6, 2017
Merged

Font tidy #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c69aa3f
Fix a few small bugs
Gastove Jun 3, 2017
36eee39
Merge branch 'master' into font-tidy
Gastove Jun 3, 2017
b3a864e
Update faceup to capture font-locking <|
Gastove Jun 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions fsharp-mode-font.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ with initial value INITVALUE and optional DOCSTRING."
"Match the full range of pipe operators -- |>, ||>, |||>, etc.")

(def-fsharp-compiled-var fsharp-operator-case-regexp
"\\s-*\\(|\\)[A-Za-z0-9_' ]"
"\\s-+\\(|\\)[A-Za-z0-9_' ]"
"Match literal | in contexts like match and type declarations.")

(defvar fsharp-imenu-generic-expression
Expand Down Expand Up @@ -283,17 +283,16 @@ with initial value INITVALUE and optional DOCSTRING."
(,fsharp-type-def-regexp 1 font-lock-type-face)
(,fsharp-function-def-regexp 1 font-lock-function-name-face)
(,fsharp-pattern-function-regexp 1 font-lock-function-name-face)
;; (,fsharp-active-pattern-regexp 1 font-lock-function-name-face)
;; Active records
("(|" (0 'fsharp-ui-operator-face)
("\\([A-Za-z'_]+\\)\\(|)?\\)" nil nil
("\\([A-Za-z'_]+\\)\\(|)\\)" nil nil
(1 font-lock-function-name-face)
(2 'fsharp-ui-operator-face)))
(,fsharp-operator-pipe-regexp . 'fsharp-ui-operator-face)
(,fsharp-member-function-regexp 1 font-lock-function-name-face)
(,fsharp-overload-operator-regexp 1 font-lock-function-name-face)
(,fsharp-constructor-regexp 1 font-lock-function-name-face)
(,fsharp-operator-case-regexp 1 'fsharp-ui-operator-face)
(,fsharp-operator-pipe-regexp . 'fsharp-ui-operator-face)

(,fsharp-operator-quote-regexp (1 'fsharp-ui-operator-face)
(2 'fsharp-ui-operator-face))
("[^:]:\\s-*\\(\\<[A-Za-z0-9_' ]*[^ ;\n,)}=<-]\\)\\(<[^>]*>\\)?"
Expand Down
4 changes: 2 additions & 2 deletions test/apps/FQuake3/NativeMappings.fs.faceup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ Copyright (C) 1999-2005 Id Software, Inc.
«k:module» «t:Bounds» =
«k:let» «k:inline» «f:ofNativePtr» («v:ptr»: «t:nativeptr»«:fsharp-ui-generic-face:<vec3_t>») =
Bounds (
Vec3.ofNativePtr <«:fsharp-ui-operator-face:|» NativePtr.add ptr 0,
Vec3.ofNativePtr <«:fsharp-ui-operator-face:|» NativePtr.add ptr 1)
Vec3.ofNativePtr «:fsharp-ui-operator-face:<|» NativePtr.add ptr 0,
Vec3.ofNativePtr «:fsharp-ui-operator-face:<|» NativePtr.add ptr 1)

«k:let» «k:inline» «f:toNativeByPtr» («v:ptr»: «t:nativeptr»«:fsharp-ui-generic-face:<vec3_t>») («v:bounds»: «t:Bounds») =
«k:let» «k:mutable» «v:nativeX» = NativePtr.get ptr 0
Expand Down